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

pages/binding/index.vue

@@ -121,11 +121,16 @@ export default {
     },
     //解析手机号
     getPhoneNumber(e) {
+		uni.showLoading({
+			title: '加载中',
+			mask:true
+		});
 		let that = this
 		if (e.detail.errMsg == "getPhoneNumber:ok") {
+			// uni.hideLoading()
 			that.decodePhoneLogin(e.detail)
 		} else {
-        //console.log("用户点击了拒绝")
+			console.log("用户点击了拒绝")
 		}
     },
     //解密手机号码

pages/home.vue

 <template>
 <view class="appCotent" v-if="show">
     <view class="index-content">
-        <u-swiper radius="0 0 0 30px" :height="210" :list="list5" circular @change="e => current = e.current" :autoplay="true">
+        <u-swiper radius="0 0 0 30px" :height="210" :list="list5" circular @change="e => current = e.current" :autoplay="true" keyName="imageUrl" @click="goOtherLink">
             <view slot="indicator" class="indicator">
                 <view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
                 </view>
@@ -119,13 +119,28 @@ export default {
                     data = res.data.data
                     let imgList = []
                     data.forEach(e => {
-                        imgList.push(e.imageUrl)
+                        imgList.push(e)
                     })
                     this.list5 = imgList
-
                 }
             })
         },
+		// 轮播跳转其他页面
+		goOtherLink(index){
+			let item = this.list5[index]
+			let link = item.link;
+			var newStr = link.indexOf("http");
+			var newStr2 = link.indexOf("https");
+			if (newStr == 0 || newStr2 == 0) {
+				uni.navigateTo({
+				    url: '/pages/webview/webview?url=' + link
+				})
+				return
+			} 
+			uni.navigateTo({
+			    url: link
+			})
+		}
     },
     created() {
         this.getMoveCode()

pages/shop.vue

@@ -8,13 +8,13 @@
                 </div>
                 <div class="shop__swiper">
                     <view class="u-demo-block">
-                        <u-swiper :list="list3" previousMargin="30" nextMargin="30" circular :autoplay="true" height='150' radius="5" bgColor="#ffffff"></u-swiper>
+                        <u-swiper :list="list3" previousMargin="30" nextMargin="30" circular :autoplay="true" keyName="imageUrl" @click="goOtherLink" height='150' radius="5" bgColor="#ffffff"></u-swiper>
                     </view>
                 </div>
                 <div class="view__content">
                     <div class="view__title">超低价养车好物</div>
                     <div class="shop__list2">
-                        <div class="shop__item2" v-for="(vo,inx) in mallList" :key="inx" @click="goDetail(vo.id)">
+                        <div class="shop__item2" v-for="(vo,inx) in mallList" :key="inx" @click="goDetail(vo.id,vo.link)">
                             <div class="item2__img">
                                 <image :src="getImage(vo.mainImgUrl)" />
                             </div>
@@ -217,13 +217,28 @@ export default {
                     data = res.data.data
                     let imgList = []
                     data.forEach(e => {
-                        imgList.push(e.imageUrl)
+                        imgList.push(e)
                     })
                     this.list3 = imgList
-
                 }
             })
         },
+		// 轮播跳转其他页面
+		goOtherLink(index){
+			let item = this.list3[index]
+			let link = item.link;
+			var newStr = link.indexOf("http");
+			var newStr2 = link.indexOf("https");
+			if (newStr == 0 || newStr2 == 0) {
+				uni.navigateTo({
+				    url: '/pages/webview/webview?url=' + link
+				})
+				return
+			} 
+			uni.navigateTo({
+			    url: link
+			})
+		}
     },
     onReady: function () {
         uni.setNavigationBarTitle({

pagesA/pages/index/getPrice.vue

@@ -236,7 +236,6 @@ export default {
 <style lang="scss" scoped>
 .getPrice {
     width: 100%;
-    height: 100%;
 
     /deep/.uni-input-input,
     .uni-input-placeholder {
@@ -336,7 +335,7 @@ export default {
     }
 
     .car_info {
-        padding: 40rpx;
+        padding: 40rpx 40rpx 220rpx;
         background: #fff;
 
         .car_info__title {
@@ -355,7 +354,7 @@ export default {
         color: #f1251b;
         text-align: right;
         margin-top: 40rpx;
-        margin-bottom: 200rpx;
+        margin-bottom: 20rpx;
 
         image {
             width: 10rpx;