Merge branch 'test' of http://git.echepei.com/sailun/sailun-tbr-web into test

pages.json

@@ -167,6 +167,21 @@
 				"style": {
 					"navigationBarTitleText": "月度政策"
 				}
+			},
+			// 统计任务页面
+			{
+				"path": "Statistical-task/index",
+				"style": {
+					"navigationBarTitleText": "任务统计"
+				}
+
+			},
+			//查询结果
+			{
+				"path": "scancodequery/result",
+				"style": {
+					"navigationBarTitleText": "胎号查询"
+				}
 			}
 		]
 	}, {
@@ -235,13 +250,6 @@
 					}
 				}
 			},
-			//查询结果
-			{
-				"path": "scancodequery/result",
-				"style": {
-					"navigationBarTitleText": "胎号查询"
-				}
-			},
 			//入库明细
 			{
 				"path": "Warehousing-details/index",
@@ -274,22 +282,7 @@
 				}
 
 			},
-			// 统计任务页面
-			{
-				"path": "Statistical-task/index",
-				"style": {
-					"navigationBarTitleText": "任务统计"
-				}
-
-			},
-			// 核销管理页面
-			{
-				"path": "Write-off-management/index",
-				"style": {
-					"navigationBarTitleText": "核销管理"
-				}
-
-			}, {
+			 {
 				"path": "my-order/my-order",
 				"style": {
 					"navigationBarTitleText": "我的订单"
@@ -304,6 +297,14 @@
 				"style": {
 					"navigationBarTitleText": "设置"
 				}
+			},
+			// 核销管理页面
+			{
+				"path": "Write-off-management/index",
+				"style": {
+					"navigationBarTitleText": "核销管理"
+				}
+			
 			}
 		]
 	}, {

pages/home/index.vue

@@ -17,22 +17,24 @@
 				<u-notice-bar mode="vertical" :list="noticebarList" style="width: 710rpx;" type="primary"></u-notice-bar>
 			</view>
 			<view class="u-flex u-m-t-20 u-row-around u-m-l-10 u-m-r-10">
-				<u-image width="350rpx" src="../../static/sailun/scan_in.png" @click="scancodeIn" mode="widthFix" class="u-skeleton-fillet"></u-image>
-				<u-image width="350rpx" src="../../static/sailun/scan_out.png" @click="scancodeOut" mode="widthFix" class="u-skeleton-fillet"></u-image>
+				<u-image width="350rpx" src="../../static/sailun/scan_in.png" @tap="$u.throttle(inPage(0), 1000)" mode="widthFix"
+				 class="u-skeleton-fillet"></u-image>
+				<u-image width="350rpx" src="../../static/sailun/scan_out.png" @tap="$u.throttle(inPage(1), 1000)" mode="widthFix"
+				 class="u-skeleton-fillet"></u-image>
 			</view>
 			<view class="u-m-t-20">
 				<view class="u-m-l-30" style="font-size: 34rpx;">
 					快捷服务
 				</view>
 				<view class="u-flex u-flex-wrap u-row-center">
-					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/1.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
-					 @click="inStock"></u-image>
+					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/task.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
+					 @click="inPage(5)"></u-image>
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/2.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
-					 @click="inMonthlyPolicy"></u-image>
-					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/3.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
-					 @click="inInlineshop"></u-image>
-					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/4.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
-					 @click="inIntegral"></u-image>
+					 @click="inPage(3)"></u-image>
+					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/inquire.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
+					 @click="inPage(4)"></u-image>
+					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/1.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
+					 @click="inPage(2)"></u-image>
 				</view>
 			</view>
 			<view class="u-flex u-row-center u-m-t-30">
@@ -156,7 +158,7 @@
 								// console.log("已是最新版本")
 							} else if (wgtinfo.version != res.data.forceVersion) {
 								// console.log("强制版本更新"+res)
-								res.data.msg = res.data.msg.replace(/\\n/g,"\n")
+								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
 									title: "发现新版本",
 									content: res.data.msg,
@@ -178,14 +180,14 @@
 								})
 							} else if (wgtinfo.version == res.data.forceVersion) {
 								console.log("最低版本更新")
-								res.data.msg = res.data.msg.replace(/\\n/g,"\n")
+								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
 									title: "发现新版本",
 									content: res.data.msg,
 									showCancel: true,
 									confirmText: "立即去AppStore更新",
 									success: function(res) {
-										if (res.confirm) { 
+										if (res.confirm) {
 											console.log('用户点击确定');
 											let appleId = 1518555723
 											plus.runtime.launchApplication({
@@ -284,25 +286,51 @@
 					}
 				})
 			},
-			scancodeIn() {
-				this.$u.route({
-					url: 'pages/home/scancode/index',
-				})
-			},
-			scancodeOut() {
-				this.$u.route({
-					url: 'pages/home/scancode/scancodeout',
-				})
-			},
-			inStock() {
-				this.$u.route({
-					url: 'pages/home/my-stock/my-stock',
-				})
-			},
-			inMonthlyPolicy() {
-				this.$u.route({
-					url: 'pages/home/monthly-policy/monthly-policy',
-				})
+			inPage(index) {
+				switch (index) {
+					case 0:
+						{
+							this.$u.route({
+								url: 'pages/home/scancode/index',
+							})
+							break;
+						}
+					case 1:
+						{
+							this.$u.route({
+								url: 'pages/home/scancode/scancodeout',
+							})
+							break;
+						}
+					case 2:
+						{
+							this.$u.route({
+								url: 'pages/home/my-stock/my-stock',
+							})
+							break;
+						}
+					case 3:
+						{
+							this.$u.route({
+								url: 'pages/home/monthly-policy/monthly-policy',
+							})
+							break;
+						}
+					case 4:
+						{
+							this.$u.route({
+								url: 'pages/home/scancodequery/result',
+							})
+							break;
+						}
+					case 5:
+						{
+							this.$u.route({
+								url: 'pages/home/Statistical-task/index',
+							})
+							break;
+						}
+				}
 			},
 			inInlineshop() {
 				this.$u.toast('线上订货暂不开放');

pages/me/index.vue

@@ -97,73 +97,62 @@
 						<view style="font-size: 34rpx"> 我的服务 </view>
 					</view>
 					<view slot="body">
-						<view class="u-flex u-row-around u-flex-wrap u-col-between" style="height: 300rpx; font-size: 24rpx">
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(0)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/instock.png" :lazy-load="true" shape="circle">
-									</u-image>
+						<view class="" style="height: 300rpx; font-size: 24rpx">
+							<view class="u-flex u-row-around" style="margin: 20rpx 0;">
+								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(0)">
+									<view>
+										<u-image width="80rpx" height="80rpx" src="../../static/sailun/instock.png" :lazy-load="true" shape="circle">
+										</u-image>
+									</view>
+									<view style="color: #000000" class="u-m-t-10"> 入库明细 </view>
 								</view>
-								<view style="color: #000000" class="u-m-t-10"> 入库明细 </view>
-							</view>
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(1)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/outstock.png" :lazy-load="true" shape="circle">
-									</u-image>
-								</view>
-								<view style="color: #000000" class="u-m-t-10"> 出库明细 </view>
-							</view>
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(2)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/reward.png" :lazy-load="true" shape="circle">
-									</u-image>
-								</view>
-								<view style="color: #000000" class="u-m-t-10"> 奖励明细 </view>
-							</view>
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(3)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/task.png" :lazy-load="true" shape="circle">
-									</u-image>
-								</view>
-								<view style="color: #000000" class="u-m-t-10"> 任务统计 </view>
-							</view>
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(4)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/tirenum.png" :lazy-load="true" shape="circle">
-									</u-image>
+								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(1)">
+									<view>
+										<u-image width="80rpx" height="80rpx" src="../../static/sailun/outstock.png" :lazy-load="true" shape="circle">
+										</u-image>
+									</view>
+									<view style="color: #000000" class="u-m-t-10"> 出库明细 </view>
 								</view>
-								<view style="color: #000000" class="u-m-t-10"> 胎号查询 </view>
-							</view>
-
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(5)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/me-order.png" :lazy-load="true" shape="circle">
-									</u-image>
+								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(2)">
+									<view>
+										<u-image width="80rpx" height="80rpx" src="../../static/sailun/reward.png" :lazy-load="true" shape="circle">
+										</u-image>
+									</view>
+									<view style="color: #000000" class="u-m-t-10"> 奖励明细 </view>
 								</view>
-								<view style="color: #000000" class="u-m-t-10"> 门店订单 </view>
 							</view>
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(6)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/brand.png" :lazy-load="true" shape="circle">
-									</u-image>
+							<view class="u-flex u-row-around">
+								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(5)">
+									<view>
+										<u-image width="80rpx" height="80rpx" src="../../static/sailun/write.png" :lazy-load="true" shape="circle">
+										</u-image>
+									</view>
+									<view style="color: #000000" class="u-m-t-10">核销记录</view>
 								</view>
-								<view style="color: #000000" class="u-m-t-10">
-									经营品牌
-								</view>
-							</view>
-							<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(7)">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/supplier.png" :lazy-load="true" shape="circle">
-									</u-image>
+								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(6)">
+									<view>
+										<u-image width="80rpx" height="80rpx" src="../../static/sailun/brand.png" :lazy-load="true" shape="circle">
+										</u-image>
+									</view>
+									<view style="color: #000000" class="u-m-t-10">
+										经营品牌
+									</view>
 								</view>
-								<view style="color: #000000" class="u-m-t-10">
-									我的供应商
+								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(7)">
+									<view>
+										<u-image width="80rpx" height="80rpx" src="../../static/sailun/supplier.png" :lazy-load="true" shape="circle">
+										</u-image>
+									</view>
+									<view style="color: #000000" class="u-m-t-10">
+										我的供应商
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</u-card>
 				<u-cell-group>
-					<u-cell-item title="核销记录" @click="inPage(8)">
+<!-- 					<u-cell-item title="核销记录" @click="inPage(8)">
 						<u-icon slot="icon" size="42" name="balance-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
 					<u-cell-item title="兑换记录" @click="inPage(9)">
@@ -174,7 +163,7 @@
 					</u-cell-item>
 					<u-cell-item v-if="this.$store.state.storeInfo.sourceFlag==1" title="修改地理位置" @click="inPage(12)">
 						<u-icon slot="icon" size="42" name="points" custom-prefix="van-icon"></u-icon>
-					</u-cell-item>
+					</u-cell-item> -->
 					<u-cell-item title="设置" @click="inPage(11)">
 						<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
@@ -299,10 +288,10 @@
 						}
 					case 5:
 						{
-							this.$u.toast("门店订单暂不开放");
-							// this.$u.route({
-							// 	url: 'pages/me/my-order/my-order',
-							// })
+							// this.$u.toast("门店订单暂不开放");
+							this.$u.route({
+								url: 'pages/me/Write-off-management/index',
+							})
 							break;
 						}
 					case 6:

pages/me/setting/setting.vue

@@ -6,7 +6,8 @@
 			<view slot="body">
 				<view class="u-flex u-row-between">
 					<view class="">
-						<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle">
+						<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle" :show-loading="true">
+							<u-loading slot="loading"></u-loading>
 							<view slot="error" style="font-size: 24rpx" :fade="true" duration="450">加载失败
 							</view>
 						</u-image>