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

common/request/request.js

@@ -31,6 +31,24 @@ export function request(config) {
         baseURL: baseURL,
         timeout: 10000
     });
+	// 响应拦截器
+	newVar.interceptors.response.use({},
+	  error => {
+	    console.log('err' + error)
+	    let { message } = error;
+	    if (message == "Network Error") {
+	      message = "后端接口连接异常";
+	    }
+	    else if (message.includes("timeout")) {
+	      message = "系统接口请求超时";
+	    }
+	    else if (message.includes("Request failed with status code")) {
+	      message = "系统接口" + message.substr(message.length - 3) + "异常";
+	    }
+		console.log(message)
+	    return Promise.reject(error)
+	  }
+	)
     return newVar(config);
 }
 

components/mi-map/mi-map.vue

@@ -61,7 +61,6 @@
 					address: '请选择集合地点'
 				},
 				controls: [], // 地图中心点图标, 可更换iconPath, 详情见官方文档关于map组件的介绍
-				lonlatData:''
 			};
 		},
 		mounted() {
@@ -117,10 +116,7 @@
 
 			// 地图选择位置后 查询地点名称
 			async checkMap(res) {
-				let point = new plus.maps.Point(res.longitude,res.latitude);
-				plus.maps.Map.convertCoordinates(point, {},event=> {
-					this.lonlatData= event.coord; // 转换后的坐标值
-				});
+
 				this.addressObj = Object.assign({}, this.addressObj, {
 					longitude: res.longitude,
 					latitude: res.latitude,
@@ -199,8 +195,6 @@
 			},
 			// 提交
 			submitAdress() {
-				this.addressObj.longitude=this.lonlatData.longitude
-				this.addressObj.latitude=this.lonlatData.latitude
 				this.controls = []
 				setTimeout(() => {
 					this.$emit('updateAddress', this.addressObj)

manifest.json

@@ -68,16 +68,16 @@
             "sdkConfigs" : {
                 "ad" : {},
                 "maps" : {
-                    "baidu" : {
-                        "appkey_ios" : "KYoTmSbggKUatksUwZKXrFmZX9oiVBrR",
-                        "appkey_android" : "4wYVsEvjrdDXtsbRYsNTy1f01PAYbZin"
+                    "amap" : {
+                        "appkey_ios" : "006f18e060f3e7887c4d9f83f1844f30",
+                        "appkey_android" : "2f2b953cb2028d9a2d000b5b3af33818"
                     }
                 },
                 "geolocation" : {
-                    "baidu" : {
+                    "amap" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "KYoTmSbggKUatksUwZKXrFmZX9oiVBrR",
-                        "appkey_android" : "4wYVsEvjrdDXtsbRYsNTy1f01PAYbZin"
+                        "appkey_ios" : "006f18e060f3e7887c4d9f83f1844f30",
+                        "appkey_android" : "2f2b953cb2028d9a2d000b5b3af33818"
                     }
                 }
             },

pages/home/my-stock/my-stock.vue

@@ -54,7 +54,7 @@
 				loadText: {
 					loadmore: '轻轻上拉',
 					loading: '努力加载中',
-					nomore: '实在没有了'
+					nomore: '没有更多啦'
 				},
 				// 数据信息
 				datalist: []

pages/home/scancode/index.vue

@@ -38,7 +38,7 @@
 						<u-td class="u-td" width="15%"><text @click="confirm(index)" style="color: #FA3534;">删除</text></u-td>
 					</u-tr>
 				</u-table>
-				<u-divider color="rgb(144, 147, 153)" half-width="200" border-color="rgb(144, 147, 153)" margin-top="40">没有更多了</u-divider>
+				<u-divider color="rgb(144, 147, 153)" half-width="200" border-color="rgb(144, 147, 153)" margin-top="40">没有更多啦</u-divider>
 			</view>
 		</view>
 		<view class="determine">

pages/login/register_2.vue

@@ -188,7 +188,9 @@
 				dataUrl: "",
 				codeLoading: false,
 				modelshow: false,
-				modelcontent: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照？"
+				modelcontent: "如果店名和联系人与营业执照不一致，请重新上传清晰度更高的营业执照？",
+				lonlatData:'',
+				bd09:false
 			};
 		},
 		created() {
@@ -203,8 +205,27 @@
 
 			})
 			uni.$on('addressData', (data) => {
-				this.form.latitude = data.latitude
-				this.form.longitude = data.longitude
+				if(data.latitude&&data.longitude){
+					request({
+						url: '/baseReq/getBaiDuMapMsg',
+						method: 'get',
+						params: {
+							"longitude": data.longitude,
+							"latitude": data.latitude
+						},
+					}).then(res => {
+						if (res.data.code == 0) {
+							this.lonlatData=res.data.data.result
+							this.bd09=true
+						}
+						if (res.data.code == 500) {
+							this.$u.toast(res.data.msg);
+						}
+					}).catch(err => {
+						console.log(err)
+					}).finally(() => {
+					})
+				}
 				this.address = data.address
 				this.form.region = this.address.province + "-" + this.address.city + "-" + this.address.district
 				this.form.addressInfo = this.address.addressInfo
@@ -233,9 +254,14 @@
 		},
 		methods: {
 			nextStep() {
+				this.form.latitude = this.lonlatData.y
+				this.form.longitude = this.lonlatData.x
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-
+						if(!this.bd09){
+							this.$u.toast('正在转换坐标，请稍候');
+							return
+						}
 						this.$u.route({
 							url: 'pages/login/register_3',
 						})

pages/login/register_3.vue

@@ -32,7 +32,8 @@
 				<u-line color="#e4e7ed"></u-line>
 				<view class="content">
 					<u-checkbox-group :wrap="true" @change="checkboxGroupChange" style="display: flex;justify-content: left">
-						<u-checkbox v-model="item.checked" v-for="(item, index) in allbrandList" :key="index" :name="item.brandCode" shape="circle">
+						<u-checkbox v-model="item.checked" v-for="(item, index) in allbrandList" :key="index" :name="item.brandCode"
+						 shape="circle">
 							<view class="u-flex u-row-left" style="width: 150rpx;">
 								{{item.brandCode}}
 							</view>
@@ -58,13 +59,13 @@
 			 v-for="(item, index) in checkedAgentlist" :key="index">
 				<view slot="head">
 					<view class="u-flex u-row-between">
-					<view class="u-flex">
-						<view style="width: 8rpx;height: 34rpx;background: #0292FD;margin-right:20rpx;"></view>
-						{{item.brand}}合作品牌签约任务
-					</view>
+						<view class="u-flex">
+							<view style="width: 8rpx;height: 34rpx;background: #0292FD;margin-right:20rpx;"></view>
+							{{item.brand}}合作品牌签约任务
+						</view>
 						<view @click="delAgent(index)">
 							<u-icon name="close" color="#666666" size="36"></u-icon>
-				</view>
+						</view>
 					</view>
 				</view>
 				<view slot="body">
@@ -81,7 +82,8 @@
 							<u-icon name="order" size="36"></u-icon>
 						</view>
 						<u-radio-group v-model="item.taskNum" :disabled="item.disabledGroup" @change="changeRadiogroup(item)">
-							<u-radio @click.native.prevent="clickitem(item,i.signLv)" :label-disabled="i.labelDisabled" v-for="(i, index2) in tasknameList" :key="index2" :name="i.signLv">
+							<u-radio @click.native.prevent="clickitem(item,i.signLv)" :label-disabled="i.labelDisabled" v-for="(i, index2) in tasknameList"
+							 :key="index2" :name="i.signLv">
 								{{i.signLv}}
 							</u-radio>
 						</u-radio-group>
@@ -146,8 +148,8 @@
 				protocol: false,
 				querybrandList: [],
 				// brandList: [],
-				allbrandList:[],//弹出窗获取brand数组
-				checkedBrandlist:[]//选中brand组成一个新数组
+				allbrandList: [], //弹出窗获取brand数组
+				checkedBrandlist: [] //选中brand组成一个新数组
 			}
 		},
 		created() {
@@ -173,7 +175,7 @@
 						"area": this.formData.district,
 						"city": this.formData.city,
 						"province": this.formData.province,
-						// "area": "市北区",
+						// "area": "李沧区",
 						// "city": "青岛市",
 						// "province": "山东省",
 						"spart": "10",
@@ -184,7 +186,7 @@
 					if (res.data.code == 0) {
 						this.agentList = res.data.Data.data
 						this.agentList = this.agentList.reduce((res, item, index, array) => {
-							for (let i = 0; i < array[index].regionBrandList.length;i++) {
+							for (let i = 0; i < array[index].regionBrandList.length; i++) {
 								res.push({
 									brand: array[index].regionBrandList[i],
 									brandCode: array[index].regionBrandList[i],
@@ -193,7 +195,7 @@
 									agent_id: item.kunnr,
 									taskNum: "",
 									disabledGroup: false,
-									checked:false,
+									checked: false,
 								})
 							}
 							return res;
@@ -233,7 +235,7 @@
 				}).catch(err => {
 					console.log(err)
 				}).finally(() => {
-			
+
 				})
 			},
 			getQuerybrand() {
@@ -252,7 +254,7 @@
 				}).catch(err => {
 					console.log(err)
 				}).finally(() => {
-				
+
 				})
 			},
 			getTasknum() {
@@ -262,7 +264,7 @@
 					data: {},
 				}).then(res => {
 					if (res.data.code == 0) {
-						res.data.data.map((item, index)=> {
+						res.data.data.map((item, index) => {
 							item.checked = false;
 						})
 						this.tasknameList = res.data.data
@@ -280,7 +282,7 @@
 				this.cooperations = e
 			},
 			changeRadiogroup(item) {
-				if (item.checked==true) {
+				if (item.checked == true) {
 					this.checkedAgentlist.filter(e => (e.brand === item.brand && e.agent_id != item.agent_id)).forEach(e => e.disabledGroup =
 						false)
 				} else {
@@ -288,22 +290,22 @@
 						true)
 				}
 			},
-			clickitem (item,e) {
-				if(item.checked==false){
-					item.checked=true
-				}else{
-					item.checked=false
-					item.taskNum=""
+			clickitem(item, e) {
+				if (item.checked == false) {
+					item.checked = true
+				} else {
+					item.checked = false
+					item.taskNum = ""
 				}
 			},
 			getCooperation() {
 				if (this.cooperations != null) {
 					this.form.cooperation = this.cooperations.toString();
 					this.checkedAgentlist = this.agentList.filter(item => this.cooperations.indexOf(item.brand) > -1)
-					this.checkedBrandlist=this.checkedAgentlist.reduce((res, item, index, array) => {
-							res.push(item.brand)
-							return res;
-						}, []);
+					this.checkedBrandlist = this.checkedAgentlist.reduce((res, item, index, array) => {
+						res.push(item.brand)
+						return res;
+					}, []);
 					this.getQuerybrand()
 					this.brandShow = false
 				} else {
@@ -313,16 +315,16 @@
 			getTaskconfirm(e) {
 				this.form.tasklist = e[0].label;
 			},
-			delAgent(index){
-				this.checkedAgentlist.splice(index,1)
+			delAgent(index) {
+				this.checkedAgentlist.splice(index, 1)
 			},
 			submit() {
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
-						this.brandAgentLvQueryList=this.checkedAgentlist.filter(item => (item.disabledGroup!=true))
-						let checkenLength=this.checkedAgentlist.filter(item => (item.checked==false))
-						if(!this.brandAgentLvQueryList.length) return this.$u.toast('未正确选择经销商，请正确选择');
-						if(checkenLength.length!=0) return this.$u.toast('请选择'+checkenLength[0].brand+"品牌签约任务");
+						this.brandAgentLvQueryList = this.checkedAgentlist.filter(item => (item.disabledGroup != true))
+						let checkenLength = this.checkedAgentlist.filter(item => (item.checked == false&&item.disabledGroup==false))
+						if (!this.brandAgentLvQueryList.length) return this.$u.toast('未正确选择经销商，请正确选择');
+						if (checkenLength.length != 0) return this.$u.toast('请选择' + checkenLength[0].brand + "品牌签约任务");
 						if (!this.protocol) return this.$u.toast('请阅读并同意用户协议和隐私协议');
 						this.setData()
 					} else {
@@ -360,7 +362,7 @@
 					"storePhone": this.formData.phone,
 					"version": 1.00,
 					"wd": this.formData.latitude,
-					"addressInfo":this.formData.addressInfo
+					"addressInfo": this.formData.addressInfo
 				}
 				this.loading = true
 				request({

pages/me/Delivery-details/index.vue

@@ -98,7 +98,7 @@
 				loadText: {
 					loadmore: '无数据',
 					loading: '努力加载中',
-					nomore: '我是有底线的'
+					nomore: '没有更多啦'
 				},
 				style: '.5rpx solid #FFFFFF',
 				list: [{

pages/me/Warehousing-details/index.vue

@@ -98,7 +98,7 @@
 				loadText: {
 					loadmore: '无数据',
 					loading: '努力加载中',
-					nomore: '我是有底线的'
+					nomore: '没有更多啦'
 				},
 				style: '.5rpx solid #FFFFFF',
 				list: [{

pages/me/agent-stock/agent-stock.vue

@@ -76,7 +76,7 @@
 				loadText: {
 					loadmore: '轻轻上拉',
 					loading: '努力加载中',
-					nomore: '实在没有了'
+					nomore: '没有更多啦'
 				}
 			};
 		},

pages/me/index.vue

@@ -1,365 +1,510 @@
 <template>
-	<view style="background-color: #FFFFFF;height: 100%;" class="u-skeleton">
-		<view class="u-page status_bar">
-			<view class="head">
-				<view class="status_bar">
-					<!-- 这里是状态栏 -->
-				</view>
-				<view class="u-flex u-row-between" style="padding: 30rpx 40rpx">
-					<view class="u-flex">
-						<view class="u-skeleton-circle">
-							<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle">
-								<view slot="error" style="font-size: 24rpx;" :fade="true" duration="450">加载失败
-								</view>
-							</u-image>
-						</view>
-						<view class="u-margin-left-10 u-skeleton-fillet">
-							<view style="color: #fff;font-size: 40rpx;" class="u-margin-bottom-20 ">
-								<text class="more_text">{{userInfo.storeName}}</text>
-							</view>
-							<view style="border: 1rpx solid #E3E3E3;border-radius: 30rpx;font-size:24rpx;color:#fff;padding: 2rpx 20rpx;text-align: center;">
-								{{userInfo.province}}{{userInfo.city}}{{userInfo.district}}{{userInfo.addressInfo}}
-							</view>
-						</view>
-					</view>
-					<view class="u-skeleton-fillet" @click="showQr=!showQr">
-						<!-- <u-icon name="qr" size="80rpx" custom-prefix="van-icon" color="#fff"></u-icon> -->
-						<u-image width="60rpx" height="60rpx" src="../../static/sailun/qrcode.png" :lazy-load="true">
-						</u-image>
-					</view>
-				</view>
-				<view class="u-flex u-row-around u-m-t-20">
-					<view class="u-text-center u-skeleton-fillet">
-						<view style="font-size:34rpx; color: #FFFFFF;">
-							{{userInfo.contactName}}
-						</view>
-						<view style="color: #B3DAFF;opacity: 0.9;">
-							联系人
-						</view>
-					</view>
-					<view class="u-text-center u-skeleton-fillet">
-						<view style="font-size:34rpx;color: #FFFFFF;">
-							{{userInfo.district}}
-						</view>
-						<view style="color: #B3DAFF;opacity: 0.9;">
-							区域
-						</view>
-					</view>
-				</view>
-			</view>
-			<view style="position: relative;top:-110rpx;margin-bottom: 100rpx;">
-				<u-card padding="20" box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)" border-radius="20" :show-foot="false"
-				 :border="false" class="u-skeleton-fillet">
-					<view slot="head" class="u-flex u-row-between u-col-bottom">
-						<view style="font-size: 34rpx;">
-							结算中心
-						</view>
-						<view class="u-col-bottom" @click="insettlement" style="color: #4B4B4B;font-size: 24rpx;">
-							查看全部
-						</view>
-					</view>
-					<view slot="body">
-						<view class="u-flex u-row-around">
-							<view class="u-text-center">
-								<view style="color: #0095FF;font-size: 30rpx;">
-									{{userInfo.usableMoney|numberFormat}}
-								</view>
-								<view style="color: #333333;">
-									我的奖励
-								</view>
-							</view>
-							<view class="u-text-center">
-								<view style="color: #0095FF;font-size: 30rpx;">
-									{{userInfo.blockMoney|numberFormat}}
-								</view>
-								<view style="color: #333333;">
-									冻结奖励
-								</view>
-							</view>
-							<view class="u-text-center">
-								<view style="color: #0095FF;font-size: 30rpx;">
-									{{userInfo.allBlockMoney|numberFormat}}
-								</view>
-								<view style="color: #333333;">
-									待核销
-								</view>
-							</view>
-							<view class="u-text-center">
-								<view style="color: #0095FF;font-size: 30rpx;">
-									{{userInfo.storeTotalIntegral|numberFormat}}
-								</view>
-								<view style="color: #333333;">
-									可用积分
-								</view>
-							</view>
-						</view>
-					</view>
-				</u-card>
-				<u-card padding="20" box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)" border-radius="20" :show-foot="false"
-				 :border="false" class="u-skeleton-fillet">
-					<view slot="head" class="u-flex u-row-between u-col-bottom">
-						<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="inInstore">
-								<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 class="u-flex u-row-centter" style="flex-direction: column;width: 25%;" @click="inOutstore">
-								<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="inReward">
-								<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="inStatistical">
-								<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="inresult">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/tirenum.png" :lazy-load="true" shape="circle">
-									</u-image>
-								</view>
-								<view style="color: #000000;" class="u-m-t-10">
-									胎号查询
-								</view>
-							</view>
+  <view style="background-color: #ffffff; height: 100%" class="u-skeleton">
+    <view class="u-page status_bar">
+      <view class="head">
+        <view class="status_bar">
+          <!-- 这里是状态栏 -->
+        </view>
+        <view class="u-flex u-row-between" style="padding: 30rpx 40rpx">
+          <view class="u-flex">
+            <view class="u-skeleton-circle">
+              <u-image
+                width="130rpx"
+                height="130rpx"
+                :src="userInfo.storeImageUrl"
+                :lazy-load="true"
+                shape="circle"
+              >
+                <view
+                  slot="error"
+                  style="font-size: 24rpx"
+                  :fade="true"
+                  duration="450"
+                  >加载失败
+                </view>
+              </u-image>
+            </view>
+            <view class="u-margin-left-10 u-skeleton-fillet">
+              <view
+                style="color: #fff; font-size: 40rpx"
+                class="u-margin-bottom-20"
+              >
+                <text class="more_text">{{ userInfo.storeName }}</text>
+              </view>
+              <view
+                style="
+                  border: 1rpx solid #e3e3e3;
+                  border-radius: 30rpx;
+                  font-size: 24rpx;
+                  color: #fff;
+                  padding: 2rpx 20rpx;
+                  text-align: center;
+                "
+              >
+                {{ userInfo.province }}{{ userInfo.city }}{{ userInfo.district
+                }}{{ userInfo.addressInfo }}
+              </view>
+            </view>
+          </view>
+          <view class="u-skeleton-fillet" @click="showQr = !showQr">
+            <!-- <u-icon name="qr" size="80rpx" custom-prefix="van-icon" color="#fff"></u-icon> -->
+            <u-image
+              width="60rpx"
+              height="60rpx"
+              src="../../static/sailun/qrcode.png"
+              :lazy-load="true"
+            >
+            </u-image>
+          </view>
+        </view>
+        <view class="u-flex u-row-around u-m-t-20">
+          <view class="u-text-center u-skeleton-fillet">
+            <view style="font-size: 34rpx; color: #ffffff">
+              {{ userInfo.contactName }}
+            </view>
+            <view style="color: #b3daff; opacity: 0.9"> 联系人 </view>
+          </view>
+          <view class="u-text-center u-skeleton-fillet">
+            <view style="font-size: 34rpx; color: #ffffff">
+              {{ userInfo.district }}
+            </view>
+            <view style="color: #b3daff; opacity: 0.9"> 区域 </view>
+          </view>
+        </view>
+      </view>
+      <view style="position: relative; top: -110rpx; margin-bottom: 100rpx">
+        <u-card
+          padding="20"
+          box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)"
+          border-radius="20"
+          :show-foot="false"
+          :border="false"
+          class="u-skeleton-fillet"
+        >
+          <view slot="head" class="u-flex u-row-between u-col-bottom">
+            <view style="font-size: 34rpx"> 结算中心 </view>
+            <view
+              class="u-col-bottom"
+              @click="insettlement"
+              style="color: #4b4b4b; font-size: 24rpx"
+            >
+              查看全部
+            </view>
+          </view>
+          <view slot="body">
+            <view class="u-flex u-row-around">
+              <view class="u-text-center">
+                <view style="color: #0095ff; font-size: 30rpx">
+                  {{ userInfo.usableMoney | numberFormat }}
+                </view>
+                <view style="color: #333333"> 我的奖励 </view>
+              </view>
+              <view class="u-text-center">
+                <view style="color: #0095ff; font-size: 30rpx">
+                  {{ userInfo.blockMoney | numberFormat }}
+                </view>
+                <view style="color: #333333"> 冻结奖励 </view>
+              </view>
+              <view class="u-text-center">
+                <view style="color: #0095ff; font-size: 30rpx">
+                  {{ userInfo.allBlockMoney | numberFormat }}
+                </view>
+                <view style="color: #333333"> 待核销 </view>
+              </view>
+              <view class="u-text-center">
+                <view style="color: #0095ff; font-size: 30rpx">
+                  {{ userInfo.storeTotalIntegral | numberFormat }}
+                </view>
+                <view style="color: #333333"> 可用积分 </view>
+              </view>
+            </view>
+          </view>
+        </u-card>
+        <u-card
+          padding="20"
+          box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)"
+          border-radius="20"
+          :show-foot="false"
+          :border="false"
+          class="u-skeleton-fillet"
+        >
+          <view slot="head" class="u-flex u-row-between u-col-bottom">
+            <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>
+                <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>
+                <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="inorder">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/me-order.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="inCoupon">
-								<view>
-									<u-image width="80rpx" height="80rpx" src="../../static/sailun/coupon.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="inSuppliers">
-								<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>
-				</u-card>
-				<u-cell-group>
-					<u-cell-item title="核销记录" @click="inWrite">
-						<u-icon slot="icon" size="42" name="balance-o" custom-prefix="van-icon"></u-icon>
-					</u-cell-item>
-					<u-cell-item title="兑换记录">
-						<u-icon slot="icon" size="42" name="balance-list-o" custom-prefix="van-icon"></u-icon>
-					</u-cell-item>
-					<u-cell-item title="经销商库存" @click="inAgentStock">
-						<u-icon slot="icon" size="42" name="points" custom-prefix="van-icon"></u-icon>
-					</u-cell-item>
-					<u-cell-item title="设置" @click="inSetting">
-						<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon"></u-icon>
-					</u-cell-item>
-				</u-cell-group>
-			</view>
-		</view>
-		<u-modal v-model="showQr" :show-title="false" :mask-close-able="true" :show-confirm-button="false" width="440">
-			<view class="slot-content u-p-40 u-flex u-row-center">
-				<u-image width="360rpx" height="360rpx" :src="userInfo.qrbarcodeSrc"></u-image>
-			</view>
-		</u-modal>
-		<u-skeleton :loading="loading" :animation="true"></u-skeleton>
-	</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>
+                <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/coupon.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(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>
+        </u-card>
+        <u-cell-group>
+          <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)">
+            <u-icon
+              slot="icon"
+              size="42"
+              name="balance-list-o"
+              custom-prefix="van-icon"
+            ></u-icon>
+          </u-cell-item>
+          <u-cell-item title="经销商库存" @click="inPage(10)">
+            <u-icon
+              slot="icon"
+              size="42"
+              name="points"
+              custom-prefix="van-icon"
+            ></u-icon>
+          </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>
+        </u-cell-group>
+      </view>
+    </view>
+    <u-modal
+      v-model="showQr"
+      :show-title="false"
+      :mask-close-able="true"
+      :show-confirm-button="false"
+      width="440"
+    >
+      <view class="slot-content u-p-40 u-flex u-row-center">
+        <u-image
+          width="360rpx"
+          height="360rpx"
+          :src="userInfo.qrbarcodeSrc"
+        ></u-image>
+      </view>
+    </u-modal>
+    <u-skeleton :loading="loading" :animation="true"></u-skeleton>
+  </view>
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import {
-		request
-	} from '../../common/request/request'
-	require("promise.prototype.finally").shim()
-	export default {
-		data() {
-			return {
-				userInfo: "",
-				showQr: false,
-				loading: true, // 是否显示骨架屏组件
-			};
-		},
-		filters: {
-			numberFormat(value) {
-				let unit = '';
-				if (value) {
-					var k = 10000,
-						sizes = ['', '万', '亿', '万亿'],
-						i;
-					if (value < k) {
-						value = value;
-					} else {
-						i = Math.floor(Math.log(value) / Math.log(k));
-						value = ((value / Math.pow(k, i))).toFixed(2);
-						unit = sizes[i];
-					}
-					return value + unit;
-				} else {
-					return 0
-				}
-			}
-		},
-		computed: {
-			...mapState(['undataStore'])
-		},
-		created() {
-			this.getMyinfo()
-		},
-		onShow() {
-			if (this.undataStore) {
-				this.getMyinfo()
-			}
-		},
-		methods: {
-			...mapMutations(["outStore"]),
-			getMyinfo() {
-				request({
-					url: '/myapp/selectStore',
-					method: 'post',
-					data: {
-						"storeId": this.$store.state.storeInfo.storeId,
-					}
-				}).then(res => {
-					this.userInfo = res.data.data
-				}).catch(err => {
-					console.log(err)
-				}).finally(() => {
-					this.loading = false;
-					this.outStore();
-					uni.hideLoading();
-				})
-			},
-			inInstore() {
-				this.$u.route({
-					url: 'pages/me/Warehousing-details/index',
-				})
-			},
-			inOutstore() {
-				this.$u.route({
-					url: 'pages/me/Delivery-details/index',
-				})
-			},
-			inReward() {
-				this.$u.route({
-					url: 'pages/me/Reward-details/index',
-				})
-			},
-			inStatistical() {
-				this.$u.route({
-					url: 'pages/me/Statistical-task/index',
-				})
-			},
-			inresult() {
-				console.log("触发了")
-				this.$u.route({
-					url: 'pages/me/scancodequery/result',
-				})
-			},
-			inorder() {
-				this.$u.toast('门店订单暂不开放');
-				// this.$u.route({
-				// 	url: 'pages/me/my-order/my-order',
-				// })
-			},
-			inCoupon() {
-				this.$u.toast('我的优惠券暂不开放');
-				// this.$u.route({
-				// 	url: 'pages/me/coupon',
-				// })
-			},
-			inSuppliers() {
-				this.$u.route({
-					url: 'pages/me/suppliers',
-				})
-			},
-			inAgentStock() {
-				this.$u.route({
-					url: 'pages/me/agent-stock/agent-stock',
-				})
-			},
-			inSetting() {
-				this.$u.route({
-					url: 'pages/me/setting/setting',
-				})
-			},
-			// 核销管理
-			inWrite() {
-				this.$u.route({
-					url: 'pages/me/Write-off-management/index',
-				})
-			},
-			// 查看结算
-			insettlement() {
-				this.$u.route({
-					url: 'pages/me/Settlement-center/index',
-				})
-			}
-		}
-	}
+import { mapState, mapMutations } from "vuex";
+import { request } from "../../common/request/request";
+require("promise.prototype.finally").shim();
+export default {
+  data() {
+    return {
+      userInfo: "",
+      showQr: false,
+      loading: true, // 是否显示骨架屏组件
+    };
+  },
+  filters: {
+    numberFormat(value) {
+      let unit = "";
+      if (value) {
+        var k = 10000,
+          sizes = ["", "万", "亿", "万亿"],
+          i;
+        if (value < k) {
+          value = value;
+        } else {
+          i = Math.floor(Math.log(value) / Math.log(k));
+          value = (value / Math.pow(k, i)).toFixed(2);
+          unit = sizes[i];
+        }
+        return value + unit;
+      } else {
+        return 0;
+      }
+    },
+  },
+  computed: {
+    ...mapState(["undataStore"]),
+  },
+  created() {
+    this.getMyinfo();
+  },
+  onShow() {
+    if (this.undataStore) {
+      this.getMyinfo();
+    }
+  },
+  methods: {
+    ...mapMutations(["outStore"]),
+    getMyinfo() {
+      request({
+        url: "/myapp/selectStore",
+        method: "post",
+        data: {
+          storeId: this.$store.state.storeInfo.storeId,
+        },
+      })
+        .then((res) => {
+          this.userInfo = res.data.data;
+        })
+        .catch((err) => {
+          console.log(err);
+        })
+        .finally(() => {
+          this.loading = false;
+          this.outStore();
+          uni.hideLoading();
+        });
+    },
+    inPage(index) {
+      switch (index) {
+        case 0: {
+          this.$u.route({
+            url: "pages/me/Warehousing-details/index",
+          });
+          break;
+        }
+        case 1: {
+          this.$u.route({
+            url: "pages/me/Delivery-details/index",
+          });
+          break;
+        }
+        case 2: {
+          this.$u.route({
+            url: "pages/me/Reward-details/index",
+          });
+          break;
+        }
+        case 3: {
+          this.$u.route({
+            url: "pages/me/Statistical-task/index",
+          });
+          break;
+        }
+        case 4: {
+          this.$u.route({
+            url: "pages/me/scancodequery/result",
+          });
+          break;
+        }
+        case 5: {
+          this.$u.toast("门店订单暂不开放");
+          // this.$u.route({
+          // 	url: 'pages/me/my-order/my-order',
+          // })
+          break;
+        }
+        case 6: {
+          this.$u.toast("我的优惠券暂不开放");
+          // this.$u.route({
+          // 	url: 'pages/me/coupon',
+          // })
+          break;
+        }
+        case 7: {
+          this.$u.route({
+            url: "pages/me/suppliers",
+          });
+          break;
+        }
+        case 8: {
+          this.$u.route({
+            url: "pages/me/Write-off-management/index",
+          });
+          break;
+        }
+        case 9: {
+          this.$u.toast("兑换记录暂不开放");
+          break;
+        }
+        case 10: {
+          this.$u.route({
+            url: "pages/me/agent-stock/agent-stock",
+          });
+          break;
+        }
+        case 11: {
+          this.$u.route({
+            url: "pages/me/setting/setting",
+          });
+          break;
+        }
+      }
+    },
+    // 查看结算
+    insettlement() {
+      this.$u.route({
+        url: "pages/me/Settlement-center/index",
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.status_bar {
-		height: var(--status-bar-height);
-	}
+.status_bar {
+  height: var(--status-bar-height);
+}
 
-	.head {
-		width: 750rpx;
-		min-height: 460rpx;
-		background-image: url(../../static/sailun/mebg.png);
-		background-size: 100% 100%;
-	}
+.head {
+  width: 750rpx;
+  min-height: 460rpx;
+  background-image: url(../../static/sailun/mebg.png);
+  background-size: 100% 100%;
+}
 
-	.more_text {
-		text-overflow: ellipsis;
-		overflow: hidden;
-		display: -webkit-box;
-		-webkit-line-clamp: 1;
-		/*设置显示行数，此处为2行*/
-		-webkit-box-orient: vertical;
-		width: 450rpx;
-	}
+.more_text {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  /*设置显示行数，此处为2行*/
+  -webkit-box-orient: vertical;
+  width: 450rpx;
+}
 </style>

uview-ui/components/u-loadmore/u-loadmore.vue

@@ -78,7 +78,7 @@
 					return {
 						loadmore: '加载更多',
 						loading: '正在加载...',
-						nomore: '没有更多了'
+						nomore: '没有更多啦'
 					}
 				}
 			},