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

manifest.json

@@ -2,7 +2,7 @@
     "name" : "耀灵全钢店管家",
     "appid" : "__UNI__0C3473D",
     "description" : "测试",
-    "versionName" : "0.0.1",
+    "versionName" : "0.0.2",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

pages/login/index.vue

@@ -43,7 +43,8 @@
 		</view>
 		<view class="foot">
 			<view class="u-flex u-row-center u-col-center">
-				<u-divider color="#0095FF" border-color="#0095FF" bg-color="#F4F4F4" fontSize="30" @click="switchLang">{{$t("login.Lan")}}</u-divider>
+				<!-- <u-divider color="#0095FF" border-color="#0095FF" bg-color="#F4F4F4" fontSize="30" @click="switchLang">{{$t("login.Lan")}}</u-divider> -->
+				<u-divider color="#0095FF" border-color="#0095FF" bg-color="#F4F4F4" fontSize="30">赛轮集团</u-divider>
 			</view>
 		</view>
 	</view>

pages/login/register_3.vue

@@ -104,10 +104,21 @@
 				</view>
 			</u-card>
 			<u-form-item :border-bottom="false">
-				<view style="margin:0 30rpx;">
+				<view style="margin:0 30rpx;" class="u-flex">
 					<u-checkbox-group>
-						<u-checkbox v-model="protocol">同意《用户协议》及《隐私政策》</u-checkbox>
+						<u-checkbox v-model="protocol">
+						</u-checkbox>
 					</u-checkbox-group>
+					<view class="u-flex">
+						同意
+						<view class="" @click="openPdf(xy)">
+							《用户协议》
+						</view>
+						及
+						<view class="" @click="openPdf(zc)">
+							《隐私政策》
+						</view>
+					</view>
 				</view>
 			</u-form-item>
 		</u-form>
@@ -164,6 +175,24 @@
 			this.getTasknum()
 		},
 		methods: {
+			openPdf(x) {
+				if(x=='xy'){
+					uni.openDocument({
+						filePath: '../../static/pdf/xy.pdf',
+						success: function(res) {
+							console.log('打开文档成功');
+						}
+					});
+				}else{
+					uni.openDocument({
+						filePath: '../../static/pdf/zc.pdf',
+						success: function(res) {
+							console.log('打开文档成功');
+						}
+					});
+				}
+				
+			},
 			getAgentArea() {
 				uni.showLoading({
 					title: '加载中...'

pages/me/Delivery-details/index.vue

@@ -325,6 +325,13 @@
 					}
 				}).then(res => {
 					console.log(res)
+					if(res.data.code == 500){
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg,
+							position: "bottom"
+						})
+					}else{
 					this.total = res.data.stock
 					this.length = res.data.count
 					this.itemList = this.itemList.concat(res.data.record)
@@ -337,6 +344,7 @@
 					}
 					console.log(this.itemList)
 					return this.itemList
+					}
 				}).catch(err => {
 					console.log(err)
 				}).finally(() => {

pages/me/Warehousing-details/index.vue

@@ -324,18 +324,26 @@
 					}
 				}).then(res => {
 					console.log(res)
-					this.total = res.data.stock
-					this.length = res.data.count
-					this.itemList = this.itemList.concat(res.data.record)
-					if (this.itemList.length >= res.data.count) this.status = 'nomore';
-					else this.status = 'loading';
-					if (this.itemList.length == 0) {
-						this.judge = true
-					} else {
-						this.judge = false
+					if(res.data.code == 500){
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg,
+							position: "bottom"
+						})
+					}else{
+						this.total = res.data.stock
+						this.length = res.data.count
+						this.itemList = this.itemList.concat(res.data.record)
+						if (this.itemList.length >= res.data.count) this.status = 'nomore';
+						else this.status = 'loading';
+						if (this.itemList.length == 0) {
+							this.judge = true
+						} else {
+							this.judge = false
+						}
+						console.log(this.itemList)
+						return this.itemList
 					}
-					console.log(this.itemList)
-					return this.itemList
 				}).catch(err => {
 					console.log(err)
 				}).finally(() => {

pages/me/index.vue

@@ -172,6 +172,9 @@
 					<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 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 title="设置" @click="inPage(11)">
 						<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>

pages/me/suppliers.vue

@@ -99,7 +99,7 @@
 		width: 667rpx;
 		height: auto;
 		background: #FFFFFF;
-		box-shadow: 0px 10px 40px 0px rgba(223, 223, 223, 0.51);
+		box-shadow: 0px 10rpx 30rpx 0px rgba(223, 223, 223, 0.51);
 		border-radius: 18px;
 		margin: 0 auto;
 		padding-top: 30rpx;