瀏覽代碼

登陆+调整

xhj 3 年之前
父節點
當前提交
4b1aff6bd2

+ 86 - 0
mine/myUser/myUser.css

@@ -0,0 +1,86 @@
+page{
+	background-color: #f5f5f5;
+}
+/* 搜索 */
+.search-box{
+	padding: 30rpx;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: #f5f5f5;
+}
+.search-saoma{
+	width: 40rpx;
+	height: 40rpx;
+	margin-right: 45rpx;
+}
+.search-input{
+	height: 76rpx;
+	line-height: 76rpx;
+	background: #fff;
+	border-radius: 20rpx 20rpx 20rpx 20rpx;
+	opacity: 1;
+	padding: 0 16rpx 0 30rpx;
+}
+.search-input-icon{
+	width: 26rpx;
+	height: 26rpx;
+	margin-right: 10rpx;
+}
+.search-btn{
+	width: 96rpx;
+	height: 47rpx;
+	line-height: 47rpx;
+	background: #EB5C20;
+	border-radius: 24rpx 24rpx 24rpx 24rpx;
+	opacity: 1;
+	font-size: 22rpx;
+	font-family: SourceHanSansCN-Regular-, SourceHanSansCN-Regular;
+	font-weight: normal;
+	color: #FFFFFF;
+	text-align: center;
+	margin-left: 10rpx;
+}
+
+
+.user-item{
+	padding: 30rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+	margin: 0rpx 30rpx 30rpx;
+	justify-content: space-between;
+}
+.user-header{
+	width: 88rpx;
+	height: 88rpx;
+	margin-right: 20rpx;
+}
+.user-nickName{
+	line-height: 45rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC-Heavy, PingFang SC;
+	font-weight: 800;
+	color: #333333;
+}
+.user-phone{
+	width: 216rpx;
+	line-height: 36rpx;
+	font-size: 24rpx;
+	font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+	font-weight: 500;
+	color: #A8A5A5;
+}
+.option-btn{
+	width: 129rpx;
+	line-height: 56rpx;
+	border-radius: 73rpx 73rpx 73rpx 73rpx;
+	opacity: 1;
+	border: 2rpx solid #A8A5A5;
+	font-size: 28rpx;
+	font-family: SourceHanSansCN-Medium-, SourceHanSansCN-Medium;
+	font-weight: normal;
+	color: #333333;
+	text-align: center;
+}

+ 59 - 0
mine/myUser/myUser.vue

@@ -0,0 +1,59 @@
+<template>
+	<view style="padding-bottom: 30rpx;">
+		<view class="search-box ddflex">
+			<view class="search-input ddflex fflex">
+				<image class="search-input-icon" src="../../static/pages/images/search.png"></image>
+				<input class="fflex"  placeholder="请输入用户昵称或电话"/>
+				<view class="search-btn">搜索</view>
+			</view>
+		</view>
+		<view style="height: 135rpx;"></view>
+		<view>
+			<view class="user-item ddflex" v-for="item in 10">
+				<view class="ddflex">
+					<image class="user-header" src="../../static/images/userimg.png"></image>
+					<view class="fflex">
+						<view class="user-nickName">灰灰莫</view>
+						<view class="user-phone">顾勇(13815141671)</view>
+					</view>
+				</view>
+				<view class="option-btn">禁用</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				systems: {},
+				isTop:0,
+			}
+		},
+		onLoad(options) {
+
+		},
+		onShow() {
+			
+		},
+		methods: {
+			
+		},
+		mounted() {
+			
+		},
+		onPageScroll: function(e) {
+		}
+	}
+</script>
+
+<style>
+	@import "./myUser.css";
+</style>

+ 11 - 0
pages.json

@@ -21,6 +21,12 @@
 		{
 		{
 			"path": "pages/myMerchant/myMerchant",
 			"path": "pages/myMerchant/myMerchant",
 			"style": {
 			"style": {
+				"navigationBarTitleText": "我的门店"
+			}
+		},
+		{
+			"path": "pages/myStore/myStore",
+			"style": {
 				"navigationBarTitleText": "我的商家"
 				"navigationBarTitleText": "我的商家"
 			}
 			}
 		},
 		},
@@ -387,6 +393,11 @@
 					"style": {
 					"style": {
 						"navigationBarTitleText": "消息列表"
 						"navigationBarTitleText": "消息列表"
 					}
 					}
+				},{
+					"path": "myUser/myUser",
+					"style": {
+						"navigationBarTitleText": "我的用户"
+					}
 				}
 				}
 			]
 			]
 		},
 		},

+ 39 - 0
pages/authorize/authorize - 副本.css

@@ -0,0 +1,39 @@
+/* pages/authorize/authorize.wxss */
+.about {padding: 120rpx 40rpx 0;}
+.about .logo image {display: block;width: 180rpx;height: 180rpx;margin: 0 auto 35rpx;border-radius: 30rpx;}
+.logo {text-align: center;}
+.about .logo view {font-size: 36rpx;color: #333;}
+.btn {position: fixed;left: 0;right: 0;text-align: center;bottom: 40rpx;}
+.login {width: 600rpx !important;height: 86rpx !important;line-height: 86rpx !important;background: #05C160 !important;font-size: 32rpx;border-radius: 6rpx !important;color: #fff;margin: 0 auto !important;position: fixed;left: 50%;transform: translateX(-50%);bottom: 514rpx;}
+.zanbu, .gophone1 {font-size: 32rpx;color: #999999;
+	/* margin: 45rpx 0 80rpx; */
+	position: fixed;left: 50%;transform: translateX(-50%);bottom: 436rpx;}
+.xieyi {font-size: 24rpx;color: #999;margin-bottom: 15rpx;justify-content: center;}
+.xieyi view{color: var(--mina) !important;}
+.copy {font-size: 24rpx;color: #9b9b9b;}
+.btnphone, .goloing {width: 600rpx !important;height: 86rpx !important;line-height: 86rpx !important;background: var(--mina);border-radius: 6rpx !important;font-size: 32rpx;color: #FFFFFF;position: fixed;left: 50%;transform: translateX(-50%);bottom: 514rpx;}
+.phone {padding: 120rpx 40rpx 0;}
+.phone .logo image {display: block;width: 180rpx;height: 180rpx;margin: 0 auto 35rpx;border-radius: 30rpx;}
+.phone .logo view {font-size: 36rpx;color: #333;
+	/* font-weight: bold; */
+}
+.btn .btngophone {width: 600rpx;height: 86rpx;line-height: 86rpx;font-size: 32rpx;color: var(--mina);position: fixed;left: 50%;transform: translateX(-50%);border: 2rpx solid var(--mina);bottom: 398rpx;}
+.form {width: 600rpx;margin: 150rpx auto;padding: 0 24rpx}
+.form .borbom {padding: 32rpx 0;}
+.form .borbom {border-bottom: 1rpx solid #E2E2E2;align-items: center;}
+.form .huoqu {color: var(--mina);text-decoration: underline;margin-left: 105rpx;}
+.btn .goloing {bottom: 400rpx;}
+.btn .gophone1 {bottom: 324rpx;}
+.form .borbom image {width: 22rpx;height: 30rpx;margin-right: 16rpx;}
+.form .paw {align-items: center;padding: 38rpx 0;}
+.form .paw image {width: 26rpx;height: 28rpx;margin-right: 18rpx;}
+
+/* 隐私弹窗 */
+.ceng{position: fixed;top: 0;left: 0;right: 0;bottom: 0;background: rgba(0,0,0,.5);z-index: 99;}
+.pop-protocol{position: fixed;left: 0;right: 0;bottom: -100%;border-radius: 20rpx 20rpx 0 0;background: #fff;z-index: 100;padding: 50rpx 40rpx;transition: all .2s ease;}
+.pop-tit{font-size: 30rpx;color: #000;font-weight: bold;text-align: center;}
+.pop-con{margin-top: 40rpx;font-size: 30rpx;color: #333;line-height: 50rpx;}
+.pop-con text{color: #00A3FF;}
+.pop-btn{margin-top: 60rpx;}
+.pop-agree{background: var(--mina);height: 80rpx;line-height: 80rpx;border-radius: 10rpx;font-size: 28rpx;color: #fff;text-align: center;}
+.pop-no{font-size: 28rpx;padding: 20rpx 0;text-align: center;color: #666;margin-top: 10rpx;}

+ 420 - 0
pages/authorize/authorize - 副本.vue

@@ -0,0 +1,420 @@
+<template>
+	<view>
+		<!--pages/authorize/authorize.wxml-->
+		<block v-if="isLong">
+			<view class="about">
+				<view class="logo">
+					<image :src="logo"></image>
+					<view>{{ name }}</view>
+				</view>
+			</view>
+			<view class="btn">
+				<button class="login" @click="getWXUserProfile()">授权登录</button>
+				<!-- <button class="login" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">授权登录</button> -->
+				<view class="zanbu" @tap="back">暂不登录</view>
+				<view hover-class="none" class="xieyi ddflex">
+					<view @click="jump('/mine/page/page?title=用户协议&isXieyi=true')">《用户协议》</view>
+					及
+					<view @click="jump('/mine/page/page?title=隐私声明&isYinsi=true')">《隐私声明》</view>
+				</view>
+				<view class="copy" v-if="about.name && about.recordNumber">{{ about.name ? about.name : '' }}版权所有© {{ about.recordNumber ? about.recordNumber : '' }}</view>
+			</view>
+		</block>
+		<block v-if="isphone">
+			<view class="phone">
+				<view class="logo">
+					<image :src="logo"></image>
+					<view>{{ name }}</view>
+				</view>
+			</view>
+			<view class="btn">
+				<button class="btnphone" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信手机号快捷绑定</button>
+				<!-- <view class="btngophone r10">手机号验证绑定</view> -->
+				<view class="zanbu" @tap="back">暂不绑定</view>
+				<view hover-class="none" class="xieyi ddflex">
+					<view @click="jump('/mine/page/page?title=用户协议&isXieyi=true')">《用户协议》</view>
+					及
+					<view @click="jump('/mine/page/page?title=隐私声明&isYinsi=true')">《隐私声明》</view>
+				</view>
+				<view class="copy" v-if="about.name && about.recordNumber">{{ about.name ? about.name : '' }}版权所有© {{ about.recordNumber ? about.recordNumber : '' }}</view>
+			</view>
+
+			<!-- 绑定手机号 -->
+			<!-- <block>
+    <view class='phone'>
+      <view class='logo'>
+        <image src='{{about.logo}}'></image>
+      </view>
+    </view>
+    <view class="bgfff form r10">
+      <view class="borbom dflex"><image src="/pages/images/telephone.png"></image><input type="text" placeholder="请输入手机号" /></view>
+      <view class="dflex paw"><image src="/pages/images/paw.png"></image><input type="text" placeholder="请输入验证码" /><text class="huoqu">获取验证码</text></view>
+    </view>
+    <view class="btn">
+      <button class="goloing">立即登录</button>
+      <view class="gophone1 r10">微信手机号快捷绑定</view>
+      <navigator url="/mine/page/page?title=用户协议&isXieyi=true" hover-class="none" class="xieyi">《用户协议》</navigator>
+      <view class='copy'>{{about.name}}版权所有© {{about.recordNumber}}</view>
+    </view>
+  </block> -->
+		</block>
+		<view class="ceng" v-if="isXyShow"></view>
+		<view class="pop-protocol" :style="'bottom:' + XyBottom">
+			<view class="pop-tit">个人隐私保护指引</view>
+			<view class="pop-con">
+				为更好的保障你的个人信息安全及权利行使。我们将通过
+				<text @click="jump('/mine/page/page?title=用户协议&isXieyi=true')">《用户协议》</text>
+				和
+				<text @click="jump('/mine/page/page?title=隐私声明&isYinsi=true')">《隐私声明》</text>
+				帮助你了解我们收集、使用、存储、公开披露个人信息的情况。请仔细阅读并理解本政策的内容,若你同意,请点击下方按钮开始接受我们的服务。
+			</view>
+			<view class="pop-btn">
+				<view class="pop-agree" @click="agn()">同意并继续</view>
+				<view class="pop-no" @click="back()">不同意并退出</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// pages/authorize/authorize.js
+const app = getApp();
+const req = require('../../utils/request.js');
+
+export default {
+	data() {
+		return {
+			sessionKey: '',
+			openid: '',
+			about: {},
+			isShow: true,
+			isphone: false,
+			isLong: true,
+			istetphone: 0,
+			configRes: {},
+			logo: '',
+			name: '',
+			isPromote: false, //是否从分销进入
+			isXyShow: true ,//默认显示协议指引
+			XyBottom: '-100%',
+		};
+	},
+
+	components: {},
+	props: {},
+	onLoad: function(options) {
+		var agnXY = req.getStorage('agnXY');
+		if (agnXY) {
+			this.isXyShow = false;
+			this.XyBottom = '-100%';
+		}else{
+			setTimeout(res=>{
+				this.XyBottom = 0;
+			},200)
+		}
+
+		app.globalData.getCheckSessoin(json => {
+			this.sessionKey = json.session_key;
+			this.openid = json.openid;
+		});
+		console.log('登录页面===********************' + JSON.stringify(options));
+
+		if (req.getStorage('configRes')) {
+			let configRes = JSON.parse(req.getStorage('configRes'));
+			this.setData({
+				istetphone: configRes.user_bind_mobile,
+				logo: configRes.CONFIG_PROJECT_LOGO,
+				name: configRes.CONFIG_PROJECT_TITLE
+			});
+		} else {
+			req.g('/api/config', res => {
+				req.setStorage('configRes', JSON.stringify(res));
+				this.setData({
+					istetphone: res.user_bind_mobile,
+					logo: res.CONFIG_PROJECT_LOGO,
+					name: res.CONFIG_PROJECT_TITLE
+				});
+			});
+		}
+
+		if (options.bindmobile == 1) {
+			this.isphoneFun();
+		}
+
+		if (options.scene) {
+			this.scene = options.scene;
+			this.loadCodeParams();
+		}
+		this.getAbout();
+		// this.isphone()
+	},
+	onShow: function() {
+		uni.setNavigationBarColor({
+			frontColor: '#000000',
+			backgroundColor: '#FFFFFF'
+		});
+		uni.setNavigationBarTitle({
+			title: '授权登录'
+		}); // this.isshop()
+	},
+	onUnload: function() {
+		// 调用登录的时候会存一个REDIRECT_URL 根据REDIRECT_URL来判断用户是从哪里登录,identification用户点击暂不绑定的标识
+		// console.log(this.identification,req.getStorage('REDIRECT_URL'),app)
+		if (req.getStorage('REDIRECT_URL') == '/pages/user/user' && !this.identification) {
+			// 判断是否开启了强制绑定手机号,并且判断缓存是否有userInfo,是否存在userInfo.mobile电话
+			if (this.istetphone == '1' && req.getStorage('userInfo') && !req.getStorage('userInfo').mobile) {
+				let pages = getCurrentPages();
+				var prevPage = pages[pages.length - 2];
+				prevPage.$vm.setData({
+					noLogin: true
+				});
+				uni.navigateBack({
+					delta: -1
+				});
+				// app.globalData.switchTab('pages/index/index')
+			}
+			// 判断用户是否登录,点击返回键,就跳转到首页,并传个值到user页面,阻止调用接口,防止登录
+			if (!req.getStorage('userInfo')) {
+				let pages = getCurrentPages();
+				var prevPage = pages[pages.length - 2];
+				prevPage.$vm.setData({
+					noLogin: true
+				});
+				uni.navigateBack({
+					delta: -1
+				});
+				// app.globalData.switchTab('pages/index/index')
+			}
+		}
+	},
+	methods: {
+		jump(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+
+		loadCodeParams() {
+			let _ts = this;
+			return new Promise((resolve, reject) => {
+				if (!_ts.scene) {
+					resolve();
+					return false;
+				}
+
+				req.getRequest(
+					'/api/code/params',
+					{
+						scene: _ts.scene
+					},
+					data => {
+						if (data.scene.split('_')[1] == 'isPromote') {
+							this.isPromote = true;
+						}
+						// console.log("获取用户id====++++++++++++++" + JSON.stringify(data));
+						req.setStorage('pidCode', data.userId);
+						resolve();
+					}
+				);
+			});
+		},
+
+		agn() {
+			this.isXyShow = false;
+			this.XyBottom = '-100%';
+			req.setStorage('agnXY', true);
+		},
+
+		back() {
+			this.XyBottom = '-100%';
+			this.identification = true;
+			// uni.switchTab({
+			// 	url: req.header.appId=='ZQ1VK5oc17I387E'?'/pages/timelyDelivery/index':'/pages/index/index'
+
+			// });
+			if (this.isPromote) {
+				uni.switchTab({
+					url: req.header.appId == 'ZQ1VK5oc17I387E' ? '/pages/timelyDelivery/index' : '/pages/index/index'
+				});
+			} else {
+				uni.navigateBack();
+			}
+		},
+
+		getAbout() {
+			var _this = this;
+			req.getRequest(
+				'/api/aboutAs',
+				{},
+				function(res) {
+					_this.setData({
+						about: res
+					});
+				},
+				true
+			);
+		},
+		getWXUserProfile() {
+			let that = this;
+			try {
+				uni.getUserProfile({
+					desc: '注册',
+					success: res => {
+						// console.log('数据====', JSON.stringify(res));
+						that.toSubmitLogin(res.iv, res.encryptedData);
+					},
+					fail: res => {
+						// console.log('数据====', res);
+						req.msg(res);
+					}
+				});
+			} catch (e) {
+				//  老版
+				wx.getUserInfo({
+					success: function(ress) {
+						// console.log('getUserInfo====', JSON.stringify(ress));
+						that.toSubmitLogin(ress.iv, ress.encryptedData);
+					}
+				});
+			}
+		},
+		toSubmitLogin(iv, encryptedData) {
+			let that = this;
+			if (!encryptedData || !iv) return false;
+			let _params = {
+				sessionKey: this.sessionKey,
+				openId: this.openid,
+				iv: iv,
+				encryptedData: encryptedData
+			};
+			if (req.getStorage('pidCode')) {
+				_params.parentId = req.getStorage('pidCode');
+			}
+			req.postRequest('/api/login', _params, json => {
+				let params = json;
+				// console.log(json);
+				that.setData(params);
+				let url = req.getStorage('REDIRECT_URL');
+				req.setStorage('userInfo', json);
+
+				// req.removeStorage('MERCHANT')
+				if (that.scene) {
+					that.back();
+				} else {
+					// console.log(json.mobile);
+
+					if (that.istetphone != '1') {
+						uni.navigateBack();
+					} else {
+						if (json.mobile) {
+							uni.navigateBack();
+						} else {
+							that.isphoneFun();
+						}
+					}
+				}
+
+				that.isshop();
+			});
+		},
+		//原来的登录
+		bindGetUserInfo(e) {
+			var that = this;
+			let data = e.detail;
+			if (!data.encryptedData || !data.iv) return false;
+			let _params = {
+				sessionKey: this.sessionKey,
+				iv: data.iv,
+				encryptedData: data.encryptedData
+			}; // console.log("!!!!!!!!!!!!!!!!!!!!!!"+_params)
+
+			if (req.getStorage('pidCode')) {
+				_params.parentId = req.getStorage('pidCode');
+			}
+
+			// console.log("登录页面===" + JSON.stringify(_params));
+			req.postRequest('/api/login', _params, json => {
+				let params = json;
+				// console.log(json);
+				that.setData(params);
+				let url = req.getStorage('REDIRECT_URL');
+				req.setStorage('userInfo', json);
+
+				// req.removeStorage('MERCHANT')
+				if (that.scene) {
+					that.back();
+				} else {
+					// console.log(json.mobile);
+
+					if (that.istetphone != '1') {
+						uni.navigateBack();
+					} else {
+						if (json.mobile) {
+							uni.navigateBack();
+						} else {
+							that.isphoneFun();
+						}
+					}
+				}
+
+				that.isshop();
+			});
+		},
+
+		//判断是否开启手机绑定
+		isphoneFun() {
+			this.setData({
+				isphone: true,
+				isLong: false
+			});
+			uni.setNavigationBarTitle({
+				title: '绑定手机号'
+			});
+		},
+
+		getPhoneNumber(e) {
+			let that = this;
+			let _params = {
+				sessionKey: this.sessionKey,
+				iv: e.detail.iv,
+				encryptedData: e.detail.encryptedData
+			};
+			// console.log(e.detail.errMsg);
+
+			if (req.getStorage('pidCode')) {
+				_params.parentId = req.getStorage('pidCode');
+			}
+
+			if (e.detail.errMsg == 'getPhoneNumber:ok') {
+				req.postRequest('/api/weixin/mobile', _params, json => {
+					// console.log(json);
+
+					if (json.mobile) {
+						var userInfo = req.getStorage('userInfo');
+						userInfo.mobile = json.mobile;
+						req.setStorage('userInfo', userInfo);
+
+						if (that.scene) {
+							that.back();
+						} else {
+							uni.navigateBack();
+						}
+					}
+				});
+			} else {
+			}
+		},
+
+		// 分销的配置
+		isshop() {
+			req.p('/api/distribution/config', data => {
+				// console.log(data);
+				req.setStorage('distribution', data);
+			});
+		}
+	}
+};
+</script>
+<style>
+@import './authorize.css';
+</style>

+ 27 - 7
pages/authorize/authorize.css

@@ -1,15 +1,19 @@
 /* pages/authorize/authorize.wxss */
 /* pages/authorize/authorize.wxss */
-.about {padding: 120rpx 40rpx 0;}
-.about .logo image {display: block;width: 180rpx;height: 180rpx;margin: 0 auto 35rpx;border-radius: 30rpx;}
-.logo {text-align: center;}
-.about .logo view {font-size: 36rpx;color: #333;}
+page{
+	background-color: #fff;
+}
+
+
 .btn {position: fixed;left: 0;right: 0;text-align: center;bottom: 40rpx;}
 .btn {position: fixed;left: 0;right: 0;text-align: center;bottom: 40rpx;}
-.login {width: 600rpx !important;height: 86rpx !important;line-height: 86rpx !important;background: #05C160 !important;font-size: 32rpx;border-radius: 6rpx !important;color: #fff;margin: 0 auto !important;position: fixed;left: 50%;transform: translateX(-50%);bottom: 514rpx;}
+.login {width: 600rpx !important;height: 86rpx !important;line-height: 86rpx !important;background: #EB5C20 !important;font-size: 32rpx;border-radius: 6rpx !important;color: #fff;margin: 97rpx auto 0 !important;}
 .zanbu, .gophone1 {font-size: 32rpx;color: #999999;
 .zanbu, .gophone1 {font-size: 32rpx;color: #999999;
 	/* margin: 45rpx 0 80rpx; */
 	/* margin: 45rpx 0 80rpx; */
 	position: fixed;left: 50%;transform: translateX(-50%);bottom: 436rpx;}
 	position: fixed;left: 50%;transform: translateX(-50%);bottom: 436rpx;}
-.xieyi {font-size: 24rpx;color: #999;margin-bottom: 15rpx;justify-content: center;}
-.xieyi view{color: var(--mina) !important;}
+.xieyi {font-size: 24rpx;color: #666;margin-bottom: 15rpx;justify-content: flex-start;margin-top: 51rpx;line-height: 40rpx;}
+.xieyi text{color: #4A99DF !important;}
+.agree-icon{
+	width: 24rpx;height: 24rpx;margin-right: 17rpx;margin-top: 58rpx;
+}
 .copy {font-size: 24rpx;color: #9b9b9b;}
 .copy {font-size: 24rpx;color: #9b9b9b;}
 .btnphone, .goloing {width: 600rpx !important;height: 86rpx !important;line-height: 86rpx !important;background: var(--mina);border-radius: 6rpx !important;font-size: 32rpx;color: #FFFFFF;position: fixed;left: 50%;transform: translateX(-50%);bottom: 514rpx;}
 .btnphone, .goloing {width: 600rpx !important;height: 86rpx !important;line-height: 86rpx !important;background: var(--mina);border-radius: 6rpx !important;font-size: 32rpx;color: #FFFFFF;position: fixed;left: 50%;transform: translateX(-50%);bottom: 514rpx;}
 .phone {padding: 120rpx 40rpx 0;}
 .phone {padding: 120rpx 40rpx 0;}
@@ -37,3 +41,19 @@
 .pop-btn{margin-top: 60rpx;}
 .pop-btn{margin-top: 60rpx;}
 .pop-agree{background: var(--mina);height: 80rpx;line-height: 80rpx;border-radius: 10rpx;font-size: 28rpx;color: #fff;text-align: center;}
 .pop-agree{background: var(--mina);height: 80rpx;line-height: 80rpx;border-radius: 10rpx;font-size: 28rpx;color: #fff;text-align: center;}
 .pop-no{font-size: 28rpx;padding: 20rpx 0;text-align: center;color: #666;margin-top: 10rpx;}
 .pop-no{font-size: 28rpx;padding: 20rpx 0;text-align: center;color: #666;margin-top: 10rpx;}
+
+
+.authorize-title{
+	line-height: 67rpx;
+	font-size: 48rpx;
+	font-family: PingFang SC-Regular, PingFang SC;
+	font-weight: 400;
+	color: #333333;
+	box-sizing: border-box;
+}
+.input-box{
+	padding: 42rpx 0;
+	font-size: 32rpx;
+	font-weight: 400;
+	border-bottom: 1px solid #DEDEDE;
+}

+ 28 - 14
pages/authorize/authorize.vue

@@ -1,23 +1,34 @@
 <template>
 <template>
-	<view>
+	<view style="padding: 77rpx;box-sizing: border-box;">
 		<!--pages/authorize/authorize.wxml-->
 		<!--pages/authorize/authorize.wxml-->
 		<block v-if="isLong">
 		<block v-if="isLong">
-			<view class="about">
-				<view class="logo">
-					<image :src="logo"></image>
-					<view>{{ name }}</view>
+			<view class="authorize-title">
+				<view>您好,</view>
+				<view>欢迎使用皮小电商家版</view>
+			</view>
+			<view style="margin-top: 50rpx;">
+				<view class="input-box">
+					<input placeholder="请输入账号"/>
+				</view>
+				<view class="input-box ddflex">
+					<input type="text" class="fflex" :password="showPassword" placeholder="请输入密码" value="" />
+					<view style="padding: 10rpx;">
+						<image v-if="showPassword" @click="showPassword=false" style="width: 34rpx;height: 15rpx;margin-left: 10rpx;" src="../../static/pages/images/close-eyes.png"></image>
+						<image v-else @click="showPassword=true" style="width: 31rpx;height: 23rpx;margin-left: 10rpx;" src="../../static/pages/images/open-eyes.png"></image>
+					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-			<view class="btn">
-				<button class="login" @click="getWXUserProfile()">授权登录</button>
-				<!-- <button class="login" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">授权登录</button> -->
-				<view class="zanbu" @tap="back">暂不登录</view>
-				<view hover-class="none" class="xieyi ddflex">
-					<view @click="jump('/mine/page/page?title=用户协议&isXieyi=true')">《用户协议》</view>
-					及
-					<view @click="jump('/mine/page/page?title=隐私声明&isYinsi=true')">《隐私声明》</view>
+			
+			<button class="login" @click="getWXUserProfile()">授权登录</button>
+			<view class="dflex">
+				<image v-if='agree' class="agree-icon" src="../../static/pages/images/agree_h.png" @click="agree=false"></image>
+				<image v-else class="agree-icon" src="../../static/pages/images/agree.png" @click="agree=true"></image>
+				<view hover-class="none" class="xieyi fflex">
+					已阅读并同意
+					<text @click="jump('/mine/page/page?title=用户协议&isXieyi=true')">《皮小电用户服务协议》</text>
+					与
+					<text @click="jump('/mine/page/page?title=隐私声明&isYinsi=true')">《皮小电隐私协议》</text>
 				</view>
 				</view>
-				<view class="copy" v-if="about.name && about.recordNumber">{{ about.name ? about.name : '' }}版权所有© {{ about.recordNumber ? about.recordNumber : '' }}</view>
 			</view>
 			</view>
 		</block>
 		</block>
 		<block v-if="isphone">
 		<block v-if="isphone">
@@ -97,6 +108,9 @@ export default {
 			isPromote: false, //是否从分销进入
 			isPromote: false, //是否从分销进入
 			isXyShow: true ,//默认显示协议指引
 			isXyShow: true ,//默认显示协议指引
 			XyBottom: '-100%',
 			XyBottom: '-100%',
+			
+			showPassword:false,
+			agree:false
 		};
 		};
 	},
 	},
 
 

+ 5 - 1
pages/index/index.css

@@ -15,6 +15,7 @@ page {
 	position: absolute;
 	position: absolute;
 	top: 67rpx;
 	top: 67rpx;
 	left: 71rpx;
 	left: 71rpx;
+	right: 51rpx;
 	color: #fff;
 	color: #fff;
 }
 }
 .ljsy{
 .ljsy{
@@ -45,7 +46,7 @@ page {
 	height: 78rpx;
 	height: 78rpx;
 	opacity: 0.3;
 	opacity: 0.3;
 	background-color: #FFFFFF;
 	background-color: #FFFFFF;
-	margin: auto 50rpx;
+	margin: auto 40rpx;
 }
 }
 
 
 /* 总数 */
 /* 总数 */
@@ -63,12 +64,14 @@ page {
 	font-weight: 400;
 	font-weight: 400;
 	color: #666464;
 	color: #666464;
 	line-height: 36rpx;
 	line-height: 36rpx;
+	text-align: center;
 }
 }
 .total-data{
 .total-data{
 	line-height: 50rpx;
 	line-height: 50rpx;
 	font-size: 36rpx;
 	font-size: 36rpx;
 	font-weight: bold;
 	font-weight: bold;
 	color: #EB5C20;
 	color: #EB5C20;
+	text-align: center;
 }
 }
 .total-data-line{
 .total-data-line{
 	width: 1rpx;
 	width: 1rpx;
@@ -142,6 +145,7 @@ page {
 	border-radius: 26rpx 26rpx 26rpx 26rpx;
 	border-radius: 26rpx 26rpx 26rpx 26rpx;
 	opacity: 1;
 	opacity: 1;
 	text-align: center;
 	text-align: center;
+	font-size: 24rpx;
 }
 }
 .echart-box-timeType-item-acitve{
 .echart-box-timeType-item-acitve{
 	background: #FFFFFF;
 	background: #FFFFFF;

+ 33 - 24
pages/index/index.vue

@@ -14,34 +14,39 @@
 			<view class="jy ddflex">
 			<view class="jy ddflex">
 				<view>
 				<view>
 					<view class="jy-data">152</view>
 					<view class="jy-data">152</view>
-					<view class="jy-label">昨日交易笔数</view>
+					<view class="jy-label">今日订单数</view>
 				</view>
 				</view>
 				<view class="jy-line"></view>
 				<view class="jy-line"></view>
 				<view>
 				<view>
 					<view class="jy-data"><text style="font-size: 22rpx;font-weight: 400;">¥</text>2000.00</view>
 					<view class="jy-data"><text style="font-size: 22rpx;font-weight: 400;">¥</text>2000.00</view>
-					<view class="jy-label">昨日交易金额</view>
+					<view class="jy-label">今日营业额</view>
+				</view>
+				<view class="jy-line"></view>
+				<view>
+					<view class="jy-data"><text style="font-size: 22rpx;font-weight: 400;">¥</text>2000.00</view>
+					<view class="jy-label">今日收益额</view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
 
 
 		<!-- 总数 -->
 		<!-- 总数 -->
 		<view class="total-box ddflex">
 		<view class="total-box ddflex">
-			<view>
-				<view class="total-label">用户总数</view>
+			<view class="fflex" v-if="true">
+				<view class="total-label">商家总数</view>
 				<view class="total-data">385</view>
 				<view class="total-data">385</view>
 			</view>
 			</view>
-			<view class="total-data-line"></view>
-			<view>
-				<view class="total-label">商家总数</view>
+			<view v-if="true" class="total-data-line"></view>
+			<view class="fflex" v-if="true">
+				<view class="total-label">门店总数</view>
 				<view class="total-data">6</view>
 				<view class="total-data">6</view>
 			</view>
 			</view>
-			<view class="total-data-line"></view>
-			<view>
-				<view class="total-label">电池总数</view>
+			<view v-if="true" class="total-data-line"></view>
+			<view class="fflex">
+				<view class="total-label">设备总数</view>
 				<view class="total-data">226</view>
 				<view class="total-data">226</view>
 			</view>
 			</view>
 			<view class="total-data-line"></view>
 			<view class="total-data-line"></view>
-			<view>
+			<view class="fflex">
 				<view class="total-label">订单总数</view>
 				<view class="total-label">订单总数</view>
 				<view class="total-data">113</view>
 				<view class="total-data">113</view>
 			</view>
 			</view>
@@ -50,13 +55,17 @@
 		<!-- nav -->
 		<!-- nav -->
 		<view v-if="true" class="nav-box ddflex">
 		<view v-if="true" class="nav-box ddflex">
 			<view class="nav-item">
 			<view class="nav-item">
-				<image class="nav-item-icon" src="../../static/pages/images/wdsj.png" @click="jumpUrl('/pages/myMerchant/myMerchant')"></image>
+				<image class="nav-item-icon" src="../../static/pages/images/wdsj.png" @click="jumpUrl('/pages/myStore/myStore')"></image>
 				<view class="nav-item-title">我的商家</view>
 				<view class="nav-item-title">我的商家</view>
 			</view>
 			</view>
-			<view class="nav-item">
+			<view class="nav-item" @click="jumpUrl('/pages/myMerchant/myMerchant')">
 				<image class="nav-item-icon" src="../../static/pages/images/wdmd.png"></image>
 				<image class="nav-item-icon" src="../../static/pages/images/wdmd.png"></image>
 				<view class="nav-item-title">我的门店</view>
 				<view class="nav-item-title">我的门店</view>
 			</view>
 			</view>
+			<view class="nav-item" v-if="true" @click="jumpUrl('/mine/myUser/myUser')">
+				<image class="nav-item-icon" src="../../static/pages/images/wdyh.png"></image>
+				<view class="nav-item-title">我的用户</view>
+			</view>
 			<view class="nav-item" @click="jumpUrl('/pages/operationData/operationData')">
 			<view class="nav-item" @click="jumpUrl('/pages/operationData/operationData')">
 				<image class="nav-item-icon" src="../../static/pages/images/yysj.png"></image>
 				<image class="nav-item-icon" src="../../static/pages/images/yysj.png"></image>
 				<view class="nav-item-title">运营数据</view>
 				<view class="nav-item-title">运营数据</view>
@@ -77,11 +86,11 @@
 				<view class="echart-box-title">交易趋势</view>
 				<view class="echart-box-title">交易趋势</view>
 				<view class="echart-box-timeType ddflex">
 				<view class="echart-box-timeType ddflex">
 					<view :class="'echart-box-timeType-item '+(timeType==1?'echart-box-timeType-item-acitve':'')"
 					<view :class="'echart-box-timeType-item '+(timeType==1?'echart-box-timeType-item-acitve':'')"
-						@click="timeTypeChange(1)">日</view>
+						@click="timeTypeChange(1)">日</view>
 					<view :class="'echart-box-timeType-item '+(timeType==2?'echart-box-timeType-item-acitve':'')"
 					<view :class="'echart-box-timeType-item '+(timeType==2?'echart-box-timeType-item-acitve':'')"
-						@click="timeTypeChange(2)">按月</view>
+						@click="timeTypeChange(2)">近7日</view>
 					<view :class="'echart-box-timeType-item '+(timeType==3?'echart-box-timeType-item-acitve':'')"
 					<view :class="'echart-box-timeType-item '+(timeType==3?'echart-box-timeType-item-acitve':'')"
-						@click="timeTypeChange(3)">季度</view>
+						@click="timeTypeChange(3)">近30日</view>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view>
 			<view>
@@ -356,10 +365,10 @@
 					}]
 					}]
 				},
 				},
 
 
-				// 在线设备
+				// 已租设备
 				option4: {
 				option4: {
 					title: {
 					title: {
-						text: '在线设备',
+						text: '已租设备',
 						textStyle: {
 						textStyle: {
 							fontSize: 14,
 							fontSize: 14,
 							fontWeight: 500
 							fontWeight: 500
@@ -386,14 +395,14 @@
 						},
 						},
 						data: [{
 						data: [{
 								value: 1055,
 								value: 1055,
-								name: '在线',
+								name: '已租',
 								itemStyle: {
 								itemStyle: {
 									color: "#0FCB27"
 									color: "#0FCB27"
 								}
 								}
 							},
 							},
 							{
 							{
 								value: 735,
 								value: 735,
-								name: '未在线',
+								name: '未',
 								itemStyle: {
 								itemStyle: {
 									color: "#EAECF5"
 									color: "#EAECF5"
 								}
 								}
@@ -402,10 +411,10 @@
 					}]
 					}]
 				},
 				},
 
 
-				// 离线设备
+				// 未租设备
 				option5: {
 				option5: {
 					title: {
 					title: {
-						text: '离线设备',
+						text: '未租设备',
 						textStyle: {
 						textStyle: {
 							fontSize: 14,
 							fontSize: 14,
 							fontWeight: 500
 							fontWeight: 500
@@ -433,14 +442,14 @@
 						},
 						},
 						data: [{
 						data: [{
 								value: 1055,
 								value: 1055,
-								name: '离线',
+								name: '未租设备',
 								itemStyle: {
 								itemStyle: {
 									color: "#666464"
 									color: "#666464"
 								}
 								}
 							},
 							},
 							{
 							{
 								value: 735,
 								value: 735,
-								name: '未离线',
+								name: '已租设备',
 								itemStyle: {
 								itemStyle: {
 									color: "#EAECF5"
 									color: "#EAECF5"
 								}
 								}

+ 7 - 22
pages/myMerchant/myMerchant.vue

@@ -4,26 +4,11 @@
 		<view>
 		<view>
 			<view class="search-box ddflex">
 			<view class="search-box ddflex">
 				<image class="search-icon" src="../../static/images/ssico.png"></image>
 				<image class="search-icon" src="../../static/images/ssico.png"></image>
-				<input class="fflex" placeholder="请输入商家名称或电话"/>
+				<input class="fflex" placeholder="请输入门店名称或电话"/>
 				<view class="search-btn">搜索</view>
 				<view class="search-btn">搜索</view>
 			</view>
 			</view>
 		</view>
 		</view>
 		
 		
-		<!-- 图表统计 -->
-		<view class="echart-box">
-			<view class="sssb-box ddflex">
-				<view class="sssb-item">
-					<view class="sssb-label">商家总数</view>
-					<view class="sssb-data sssb-color">867.00</view>
-				</view>
-				<view class="sssb-line"></view>
-				<view class="sssb-item">
-					<view class="sssb-label">门店总数</view>
-					<view class="sssb-data sssb-color">1915.00</view>
-				</view>
-			</view>
-		</view>
-		
 		<view>
 		<view>
 			<view class="sjyy-item" v-for="item,index in 10">
 			<view class="sjyy-item" v-for="item,index in 10">
 				<view class="ddflex">
 				<view class="ddflex">
@@ -32,18 +17,18 @@
 					</view>
 					</view>
 					<view class="fflex">
 					<view class="fflex">
 						<view class="sjyy-name ddflex">
 						<view class="sjyy-name ddflex">
-							<view>宋秀兰</view>
-							<view class="sjyy-name-label">我的商家</view>
+							<view>白云科技门店</view>
+							<!-- <view class="sjyy-name-label">我的门店</view> -->
 						</view>
 						</view>
-						<view class="sjyy-phone">13815141671</view>
+						<view class="sjyy-phone">顾勇(13815141671)</view>
 					</view>
 					</view>
 					<view>
 					<view>
 						<image style="width: 48rpx;height: 48rpx;margin-left: 20rpx;" src="../../static/pages/images/call.png"></image>
 						<image style="width: 48rpx;height: 48rpx;margin-left: 20rpx;" src="../../static/pages/images/call.png"></image>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="sjyy-data ddflex">
 				<view class="sjyy-data ddflex">
-					<image style="width: 19rpx;height: 25rpx;margin-right: 10rpx;" src="../../static/pages/images/dwico1.png"></image>
-					<view class="tover fflex" style="font-size: 24rpx;line-height: 36rpx;">朝阳区金台路道家园1号</view>
+					<image style="width: 26rpx;height: 26rpx;margin-right: 10rpx;" src="../../static/pages/images/address-icon.png"></image>
+					<view class="tover fflex" style="font-size: 24rpx;line-height: 36rpx;color: #A8A5A5;">朝阳区金台路道家园1号</view>
 				</view>
 				</view>
 				<view class="sjyy-data ddflex">
 				<view class="sjyy-data ddflex">
 					<view class="sjyy-data-item fflex">
 					<view class="sjyy-data-item fflex">
@@ -68,7 +53,7 @@
 						<view class="sssb-data sssb-color">50%</view>
 						<view class="sssb-data sssb-color">50%</view>
 						<view class="sssb-label">分润</view>
 						<view class="sssb-label">分润</view>
 					</view>
 					</view>
-					<view class="sjyy-data-item fflex">
+					<view class="sjyy-data-item fflex" style="visibility: hidden;">
 						<view class="sssb-data sssb-color">5</view>
 						<view class="sssb-data sssb-color">5</view>
 						<view class="sssb-label">门店数</view>
 						<view class="sssb-label">门店数</view>
 					</view>
 					</view>

+ 153 - 0
pages/myStore/myStore.css

@@ -0,0 +1,153 @@
+.search-box{
+	width: 690rpx;
+	height: 76rpx;
+	line-height: 76rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx 20rpx 20rpx 20rpx;
+	margin: 30rpx;
+	opacity: 1;
+	padding:0 30rpx;
+	box-sizing: border-box;
+}
+.search-icon{
+	width: 26rpx;
+	height: 28rpx;
+	margin-right: 10rpx;
+}
+.search-btn{
+	width: 96rpx;
+	height: 47rpx;
+	line-height: 47rpx;
+	background: #EB5C20;
+	border-radius: 24rpx 24rpx 24rpx 24rpx;
+	opacity: 1;
+	text-align: center;
+	color: #fff;
+}
+
+/* 图表 */
+.echart-box{
+	padding: 30rpx;
+	background: #FFFFFF;
+	border-radius: 16rpx 16rpx 16rpx 16rpx;
+	opacity: 1;
+	margin: 30rpx;
+}
+.echart-box-header{
+	justify-content: space-between;
+}
+.echart-box-title{
+	line-height: 45rpx;
+	font-size: 30rpx;
+	font-weight: 500;
+	color: #333333;
+	margin-left: 12rpx;
+	position: relative;
+}
+.echart-box-title::before{
+	content: '';
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+	left: -12rpx;
+	width: 6rpx;
+	height: 32rpx;
+	background: #EB5C20;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	opacity: 1;
+}
+
+.sssb-box{
+	justify-content: space-between;
+	padding: 30rpx 60rpx;
+}
+.sssb-item{
+	text-align: center;
+}
+.sssb-label{
+	line-height: 36rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #666464;
+}
+.sssb-data{
+	line-height: 50rpx;
+	font-size: 36rpx;
+	font-weight: bold;
+	color: #333333;
+	margin-top: 8rpx;
+}
+.sssb-line{
+	width: 1rpx;
+	height: 88rpx;
+	opacity: 1;
+	background-color:  #E6E6E6;
+}
+.sssb-color{
+	color: #EB5C20;
+}
+
+.sjyy-item{
+	width: 690rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx 20rpx 20rpx 20rpx;
+	opacity: 1;
+	padding: 30rpx;
+	box-sizing: border-box;
+	margin: 30rpx;
+}
+.sjyy-header{
+	width: 88rpx;
+	height: 88rpx;
+	background: #F5F5F5;
+	opacity: 1;
+	border-radius: 100%;
+	overflow: hidden;
+	margin-right: 10rpx;
+}
+.sjyy-header image{
+	width: 100%;
+	height: 100%;
+}
+.sjyy-name{
+	line-height: 45rpx;
+	font-size: 32rpx;
+	font-weight: 800;
+	color: #333333;
+}
+.sjyy-name-label{
+	width: 105rpx;
+	line-height: 33rpx;
+	font-size: 22rpx;
+	color: #FFFFFF;
+	text-align: center;
+	background: #2A82E4;
+	border-radius: 5rpx 5rpx 5rpx 5rpx;
+	opacity: 1;
+	margin-left: 13rpx;
+	font-weight: normal;
+}
+.sjyy-phone{
+	line-height: 36rpx;
+	font-size: 24rpx;
+	font-weight: 500;
+	color: #666464;
+}
+.sjyy-btn{
+	width: 180rpx;
+	line-height: 56rpx;
+	border-radius: 73rpx 73rpx 73rpx 73rpx;
+	opacity: 1;
+	border: 2rpx solid #A8A5A5;
+	text-align: center;
+	margin-left: 20rpx;
+}
+.sjyy-data{
+	background: rgba(242, 242, 242, 0.5);
+	border-radius: 8rpx 8rpx 8rpx 8rpx;
+	margin:20rpx auto 0;
+	padding: 20rpx;
+}
+.sjyy-data-item{
+	text-align: center;
+}

+ 131 - 0
pages/myStore/myStore.vue

@@ -0,0 +1,131 @@
+<template>
+	<view>
+		<!-- 搜索 -->
+		<view>
+			<view class="search-box ddflex">
+				<image class="search-icon" src="../../static/images/ssico.png"></image>
+				<input class="fflex" placeholder="请输入商家名称或电话"/>
+				<view class="search-btn">搜索</view>
+			</view>
+		</view>
+		
+		<!-- 图表统计 -->
+		<view class="echart-box">
+			<view class="sssb-box ddflex">
+				<view class="sssb-item">
+					<view class="sssb-label">商家总数</view>
+					<view class="sssb-data sssb-color">867.00</view>
+				</view>
+				<view class="sssb-line"></view>
+				<view class="sssb-item">
+					<view class="sssb-label">门店总数</view>
+					<view class="sssb-data sssb-color">1915.00</view>
+				</view>
+			</view>
+		</view>
+		
+		<view>
+			<view class="sjyy-item" v-for="item,index in 10">
+				<view class="ddflex">
+					<view class="sjyy-header">
+						<image src="../../static/pages/images/wdsj.png"></image>
+					</view>
+					<view class="fflex">
+						<view class="sjyy-name ddflex">
+							<view>宋秀兰</view>
+							<view class="sjyy-name-label">我的商家</view>
+						</view>
+						<view class="sjyy-phone">13815141671</view>
+					</view>
+					<view>
+						<image style="width: 48rpx;height: 48rpx;margin-left: 20rpx;" src="../../static/pages/images/call.png"></image>
+					</view>
+				</view>
+				<view class="sjyy-data ddflex">
+					<image style="width: 26rpx;height: 26rpx;margin-right: 10rpx;" src="../../static/pages/images/address-icon.png"></image>
+					<view class="tover fflex" style="font-size: 24rpx;line-height: 36rpx;color: #A8A5A5;">朝阳区金台路道家园1号</view>
+				</view>
+				<view class="sjyy-data ddflex">
+					<view class="sjyy-data-item fflex">
+						<view class="sssb-data sssb-color">10242.00</view>
+						<view class="sssb-label">累计收益</view>
+					</view>
+					<view class="sjyy-data-item fflex">
+						<view class="sssb-data sssb-color">1915.00</view>
+						<view class="sssb-label">今日收益</view>
+					</view>
+					<view class="sjyy-data-item fflex">
+						<view class="sssb-data sssb-color">9154.00</view>
+						<view class="sssb-label">本月收益</view>
+					</view>
+				</view>
+				<view class="sjyy-data ddflex">
+					<view class="sjyy-data-item fflex">
+						<view class="sssb-data sssb-color">56</view>
+						<view class="sssb-label">机柜数</view>
+					</view>
+					<view class="sjyy-data-item fflex">
+						<view class="sssb-data sssb-color">50%</view>
+						<view class="sssb-label">分润</view>
+					</view>
+					<view class="sjyy-data-item fflex">
+						<view class="sssb-data sssb-color">5</view>
+						<view class="sssb-label">门店数</view>
+					</view>
+				</view>
+				<view class="ddflex" style="justify-content: space-between;margin-top: 30rpx;">
+					<view class="sjyy-btn" style="border: 2rpx solid #EB5C20;color: #EB5C20;" @click="jumpUrl()">查看订单</view>
+					<view class="sjyy-btn" @click="jumpUrl()">查看设备</view>
+					<view class="sjyy-btn" @click="jumpUrl('/pages/operationDataPersonal/operationDataPersonal')">运营情况</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const app = getApp();
+	const req = require("../../utils/request.js");
+
+	export default {
+		components: {},
+		props: {},
+		data() {
+			return {
+				systems: {},
+				isTop:0,
+			}
+		},
+		onLoad(options) {
+
+		},
+		onShow() {
+			
+		},
+		methods: {
+			
+		},
+		mounted() {
+			const systemInfo = uni.getSystemInfoSync();
+			// px转换到rpx的比例
+			let pxToRpxScale = 750 / systemInfo.windowWidth;
+			let systems = {
+				ktxStatusHeight: systemInfo.statusBarHeight * pxToRpxScale, // 状态栏的高度
+				navigationHeight: 44 * pxToRpxScale // 导航栏的高度
+			};
+			systems.barHeight = systems.ktxStatusHeight + systems.navigationHeight;
+			this.systems = systems;
+		},
+		onPageScroll: function(e) {
+			if (e.scrollTop > this.systems.barHeight) {
+				this.isTop = 1;
+			} else {
+				this.isTop = 0;
+			}
+		}
+	}
+</script>
+
+<style>
+	@import "./myStore.css";
+</style>

+ 1 - 0
pages/operationData/operationData.css

@@ -73,6 +73,7 @@
 	border-radius: 26rpx 26rpx 26rpx 26rpx;
 	border-radius: 26rpx 26rpx 26rpx 26rpx;
 	opacity: 1;
 	opacity: 1;
 	text-align: center;
 	text-align: center;
+	font-size: 24rpx;
 }
 }
 .echart-box-timeType-item-acitve{
 .echart-box-timeType-item-acitve{
 	background: #FFFFFF;
 	background: #FFFFFF;

+ 5 - 5
pages/operationData/operationData.vue

@@ -25,11 +25,11 @@
 					<view class="echart-box-title">收益走势图</view>
 					<view class="echart-box-title">收益走势图</view>
 					<view class="echart-box-timeType ddflex">
 					<view class="echart-box-timeType ddflex">
 						<view :class="'echart-box-timeType-item '+(timeType==1?'echart-box-timeType-item-acitve':'')"
 						<view :class="'echart-box-timeType-item '+(timeType==1?'echart-box-timeType-item-acitve':'')"
-							@click="timeTypeChange(1)">日</view>
+							@click="timeTypeChange(1)">日</view>
 						<view :class="'echart-box-timeType-item '+(timeType==2?'echart-box-timeType-item-acitve':'')"
 						<view :class="'echart-box-timeType-item '+(timeType==2?'echart-box-timeType-item-acitve':'')"
-							@click="timeTypeChange(2)">按月</view>
+							@click="timeTypeChange(2)">近7日</view>
 						<view :class="'echart-box-timeType-item '+(timeType==3?'echart-box-timeType-item-acitve':'')"
 						<view :class="'echart-box-timeType-item '+(timeType==3?'echart-box-timeType-item-acitve':'')"
-							@click="timeTypeChange(3)">季度</view>
+							@click="timeTypeChange(3)">近30日</view>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view style="margin-top: 30rpx;height:500rpx">
 				<view style="margin-top: 30rpx;height:500rpx">
@@ -154,8 +154,8 @@
 						<view class="sjyy-btn" @click="jumpUrl('/pages/operationDataPersonal/operationDataPersonal')">运营情况</view>
 						<view class="sjyy-btn" @click="jumpUrl('/pages/operationDataPersonal/operationDataPersonal')">运营情况</view>
 					</view>
 					</view>
 					<view class="sjyy-data ddflex">
 					<view class="sjyy-data ddflex">
-						<image style="width: 19rpx;height: 25rpx;margin-right: 10rpx;" src="../../static/pages/images/dwico1.png"></image>
-						<view class="tover fflex" style="font-size: 24rpx;line-height: 36rpx;">朝阳区金台路道家园1号</view>
+						<image style="width: 26rpx;height: 26rpx;margin-right: 10rpx;" src="../../static/pages/images/address-icon.png"></image>
+						<view class="tover fflex" style="font-size: 24rpx;line-height: 36rpx;color: #A8A5A5;">朝阳区金台路道家园1号</view>
 					</view>
 					</view>
 					<view class="sjyy-data ddflex">
 					<view class="sjyy-data ddflex">
 						<view class="sjyy-data-item fflex">
 						<view class="sjyy-data-item fflex">

+ 1 - 1
pages/orderDetail/orderDetail.css

@@ -13,7 +13,7 @@ page{
 	color: #242323;
 	color: #242323;
 }
 }
 .act-color{
 .act-color{
-	color: #EB5C20;
+	color: #EB5C20 !important;
 }
 }
 .symbol{
 .symbol{
 	font-size: 38rpx;
 	font-size: 38rpx;

+ 1 - 1
pages/orderDetail/orderDetail.vue

@@ -73,7 +73,7 @@
 			</view>	
 			</view>	
 			<view class="info-item ddflex">
 			<view class="info-item ddflex">
 				<view class="info-item-label">电池型号</view>
 				<view class="info-item-label">电池型号</view>
-				<view class="info-item-data fflex tover act-color">60V 30Ah</view>
+				<view class="info-item-data fflex tover">60V 30Ah</view>
 			</view>
 			</view>
 			<view class="info-item ddflex">
 			<view class="info-item ddflex">
 				<view class="info-item-label">租借机柜</view>
 				<view class="info-item-label">租借机柜</view>

+ 2 - 2
pages/user/user.vue

@@ -44,11 +44,11 @@
 					<image src="../../static/pages/images/user_service1.png"></image>
 					<image src="../../static/pages/images/user_service1.png"></image>
 					<text>我的订单</text>
 					<text>我的订单</text>
 				</navigator>
 				</navigator>
-				<navigator url="" hover-class="none" class="li" @click="jumpUrl('pages/myMerchant/myMerchant')">
+				<navigator url="" hover-class="none" class="li" @click="jumpUrl('pages/myStore/myStore')">
 					<image src="../../static/pages/images/user_service2.png"></image>
 					<image src="../../static/pages/images/user_service2.png"></image>
 					<text>我的商家</text>
 					<text>我的商家</text>
 				</navigator>
 				</navigator>
-				<navigator url="" hover-class="none" class="li" @click="jumpUrl('integralshop/index/index')">
+				<navigator url="" hover-class="none" class="li" @click="jumpUrl('pages/myMerchant/myMerchant')">
 					<image src="../../static/pages/images/user_service3.png"></image>
 					<image src="../../static/pages/images/user_service3.png"></image>
 					<text>我的门店</text>
 					<text>我的门店</text>
 				</navigator>
 				</navigator>

二進制
static/pages/images/agree.png


二進制
static/pages/images/agree_h.png


二進制
static/pages/images/alarmUpload.png


二進制
static/pages/images/close-eyes.png


二進制
static/pages/images/open-eyes.png


二進制
static/pages/images/wdyh.png


+ 1 - 2
warning/machineAlarm/machineAlarm.css

@@ -95,9 +95,8 @@
 .nodata-icon{
 .nodata-icon{
 	width: 96rpx;
 	width: 96rpx;
 	height: 103rpx;
 	height: 103rpx;
-	background: #E6E6E6;
 	opacity: 1;
 	opacity: 1;
-	margin: auto;
+	margin:35rpx auto 0;
 }
 }
 .nodata-note{
 .nodata-note{
 	margin-top: 35rpx;
 	margin-top: 35rpx;

+ 1 - 1
warning/machineAlarm/machineAlarm.vue

@@ -32,7 +32,7 @@
 			@closePop="closePop()" @popSubmit="popSubmit()">
 			@closePop="closePop()" @popSubmit="popSubmit()">
 			<view>
 			<view>
 				<view>
 				<view>
-					<image class="nodata-icon" src="../../static/pages/images/user_service1.png"></image>
+					<image class="nodata-icon" src="../../static/pages/images/alarmUpload.png"></image>
 					<view class="nodata-note">上传检修记录,恢复正常</view>
 					<view class="nodata-note">上传检修记录,恢复正常</view>
 				</view>
 				</view>
 				<view class="pop-btns ddflex">
 				<view class="pop-btns ddflex">

+ 1 - 2
warning/reconditionAlarm/reconditionAlarm.css

@@ -95,9 +95,8 @@
 .nodata-icon{
 .nodata-icon{
 	width: 96rpx;
 	width: 96rpx;
 	height: 103rpx;
 	height: 103rpx;
-	background: #E6E6E6;
 	opacity: 1;
 	opacity: 1;
-	margin: auto;
+	margin:35rpx auto 0;
 }
 }
 .nodata-note{
 .nodata-note{
 	margin-top: 35rpx;
 	margin-top: 35rpx;

+ 1 - 1
warning/reconditionAlarm/reconditionAlarm.vue

@@ -32,7 +32,7 @@
 			@closePop="closePop()" @popSubmit="popSubmit()">
 			@closePop="closePop()" @popSubmit="popSubmit()">
 			<view>
 			<view>
 				<view>
 				<view>
-					<image class="nodata-icon" src="../../static/pages/images/user_service1.png"></image>
+					<image class="nodata-icon" src="../../static/pages/images/alarmUpload.png"></image>
 					<view class="nodata-note">上传检修记录,恢复正常</view>
 					<view class="nodata-note">上传检修记录,恢复正常</view>
 				</view>
 				</view>
 				<view class="pop-btns ddflex">
 				<view class="pop-btns ddflex">

+ 1 - 2
warning/userAlarm/userAlarm.css

@@ -95,9 +95,8 @@
 .nodata-icon{
 .nodata-icon{
 	width: 96rpx;
 	width: 96rpx;
 	height: 103rpx;
 	height: 103rpx;
-	background: #E6E6E6;
 	opacity: 1;
 	opacity: 1;
-	margin: auto;
+	margin:35rpx auto 0;
 }
 }
 .nodata-note{
 .nodata-note{
 	margin-top: 35rpx;
 	margin-top: 35rpx;

+ 1 - 1
warning/userAlarm/userAlarm.vue

@@ -37,7 +37,7 @@
 			@closePop="closePop()" @popSubmit="popSubmit()">
 			@closePop="closePop()" @popSubmit="popSubmit()">
 			<view>
 			<view>
 				<view>
 				<view>
-					<image class="nodata-icon" src="../../static/pages/images/user_service1.png"></image>
+					<image class="nodata-icon" src="../../static/pages/images/alarmUpload.png"></image>
 					<view class="nodata-note">上传检修记录,恢复正常</view>
 					<view class="nodata-note">上传检修记录,恢复正常</view>
 				</view>
 				</view>
 				<view class="pop-btns ddflex">
 				<view class="pop-btns ddflex">