Merge remote-tracking branch 'origin/dev_cd' into dev_jd

pages/main.vue

@@ -18,7 +18,8 @@
 		mapState
 	} from 'vuex';
 	import tabbar from '@/common/hans-tabbar/hans-tabbar'
-	import index from './home'
+	// import index from './home'
+	import index from './home-new.vue'
 	import moveCar from './moveCar'
 	import shop from './shop'
 	import personal from './personal'

pages/shop.vue

@@ -179,7 +179,7 @@ export default {
 				return
 			}
 			uni.showToast({
-				title: "该商品再无链接！",
+				title: "该商品暂无链接！",
 				icon: 'none',
 				duration: 1500,
 			});

pagesA/pages/index/getCoupon.vue

@@ -3,7 +3,7 @@
 		<!-- 我的订单 -->
 		<view class="get-coupon">
 			<view class="box">
-				<image src="../../../static/index/coupon1.png"></image>
+				<image src="http://jdnc-oss.uzosp.com/2022/05/31/5c01ded6473a44c7b5f1370b6010ae87.png"></image>
 
 				<view class="title">
 					<view style="margin-bottom:20rpx;">
@@ -22,7 +22,7 @@
 			<!-- 领取成功后弹框 -->
 			<view class="pooup-success" v-if="pooupSuccess">
 				<view class="success-box">
-					<image src="../../../static/index/coupon2.png"></image>
+					<image src="http://jdnc-oss.uzosp.com/2022/05/31/7f0a17d1075d47ffb784b4095e79d36a.png"></image>
 					<view class="close" @click="closeCoupon">
 						X
 					</view>

pagesB/pages/move-car/loveCar.vue

@@ -15,13 +15,13 @@
             </div>
             <div class="item__title" @click="goGetPrice(vo.id)">
 				<view class="title">
-					{{vo.brand + "-" + item.seriesName}}
+					{{vo.brand + "-" + vo.seriesName}}
 				</view>
                 <view class="type">
 					{{vo.carModel}}
                 </view>
 				<view class="route">
-					行驶里程 {{vo.mileage}}KM
+					行驶里程 {{vo.mileage || 0}}KM
 				</view>
             </div>
             <!-- <div class="item__edit" @click="editCar(vo.id)">

pagesB/pages/move-car/oneMoveCar.vue

@@ -111,6 +111,7 @@
 					detailInfo: '',
 					//是否微信通知
 					wechat: false,
+					code:null
 				},
 				noticeResult: {
 					secretPhone: '',
@@ -153,7 +154,10 @@
 						this.noticeResult = res.data.data
 						if (this.noticeResult.allowPhone) {
 							// this.list[0].name = this.noticeResult.secretPhone
-							this.show = true;
+							// this.show = true;
+							uni.makePhoneCall({
+								phoneNumber: this.noticeResult.secretPhone
+							});
 						}
 					} else {
 						this.noticeResult = res.data.data
@@ -195,6 +199,7 @@
 			},
 			selectClick(index) {
 				if (index.name == "呼叫") {
+					this.show = false;
 					uni.makePhoneCall({
 						phoneNumber: this.noticeResult.secretPhone
 					});

pagesB/pages/move-car/scan.vue

@@ -94,7 +94,7 @@
 				</view>
 				<view class="item-input flex align-center">
 					<input type="number" placeholder="请输入" v-model="model1.verificationCode">
-					<view class="code text-red" v-if="!smsbtn.status" @click="sendCode">
+					<view class="code" style="color: #F1251B;" v-if="!smsbtn.status" @click="sendCode">
 						{{smsbtn.text}}
 					</view>
 					<view class="code" v-else>

pagesC/pages/shop/search.vue

@@ -9,7 +9,7 @@
         <u-search placeholder="请输入商品" :showAction='false' bgColor='#ffffff' v-model="keyword" @search="searchCommodity"></u-search>
     </div>
     <div class="list">
-        <div class="list__item" v-for="(vo,inx) in items" :key="inx" @click="goDetail(vo.id)">
+        <div class="list__item" v-for="(vo,inx) in items" :key="inx" @click="goDetail(vo.id,vo.link)">
             <div class="list__img">
                 <!-- <image :src="vo.img" /> -->
                 <image :src="vo.mainImgUrl" style="width: 160rpx;height: 160rpx;border-radius:10rpx;"></image>
@@ -51,7 +51,7 @@ export default {
             let searchCondition = {
                 searchVal: this.keyword
             }
-            console.log(searchCondition)
+            console.log(searchCondition,222222222)
             let opts = { url: '/app/index/mall/list', method: 'get' };
             this.http.httpRequest(opts, searchCondition).then(res => {
                 if(res.data.code == 200){
@@ -59,10 +59,38 @@ export default {
                 }
             })
         },
-        goDetail(id) {
+        goDetail(id,link) {
+			let token = uni.getStorageSync('userToken');
+			if(!token){
+				let returnPage= '/pages/main';
+				let pageType = "reLaunch"
 				uni.navigateTo({
-                url: '/pagesC/pages/shop/detail?id=' + id
+					url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
 				})
+			    return;
+			}
+			if(link){
+				// uni.navigateTo({
+				//     url: '/pages/webview/webview?url=' + link
+				// })
+				uni.navigateToMiniProgram({
+					appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
+					path: '', // 目标小程序的页面路径
+					extraData: { // 需要携带的参数
+					},
+					success(res) {// 打开成功
+					}
+				})
+				return
+			}
+			uni.showToast({
+				title: "该商品暂无链接！",
+				icon: 'none',
+				duration: 1500,
+			});
+            // uni.navigateTo({
+            //     url: '/pagesC/pages/shop/detail?id=' + id
+            // })
         },
     },
 }

pagesD/pages/personal/userInfo.vue

@@ -9,7 +9,7 @@
             <span class="cover__name">头像</span>
             <div class="cover">
                 <image v-if="image" :src="image" />
-                <image v-else src="@/static/my/my2.png" />
+                <image v-else src="@/static/my/my2.jpg" />
                 <!-- 此处应该有默认头像 -->
                 <!--                <image v-else src="@/static/my/my2.png" />-->
                 <span>
@@ -239,6 +239,10 @@ export default {
         },
         select() {
             let that = this
+			uni.showLoading({
+				title:"加载中",
+				mask:true
+			})
             uni.chooseImage({
                 count: 1, //默认9
                 sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
@@ -270,12 +274,25 @@ export default {
                                 val: uploadData.data.url
                             };
                             that.http.httpTokenRequest(opts, userInfoItem).then(response => {
+								uni.hideLoading()
                                 if (response.data.code == 200) {
                                     that.$nextTick(() => {
                                         that.image = uploadData.data.url
                                     })
+                                }else{
+									uni.showToast({
+										title: response.data.msg,
+										icon: "error",
+									});
 								}
                             })
+                        },
+						fail() {
+                        	uni.hideLoading()
+							uni.showToast({
+								title: "上传头像失败！",
+								icon: "error",
+							});
                         }
                     });
                 }