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

common/api/api.js

 // const baseUrl = 'https://r.ucaret.cn/test-api'; // 开发地址
-const baseUrl = 'https://jduniapp.uzosp.com'; // 线上地址
+const baseUrl = 'http://4v7u6z.natappfree.cc'; // 开发地址
+// const baseUrl = 'https://jduniapp.uzosp.com'; // 线上地址
 const httpRequest = (opts, data) => {
     let httpDefaultOpts = {
         url: baseUrl + opts.url,

pages/home.vue

@@ -57,6 +57,9 @@
 			<view class="pooup-get-coupon" v-if="pooupCoupon">
 				<view class="coupon-box">
 					<image src="../../../static/index/coupon3.png"></image>
+					<view class="close" @click="closeCoupon">
+						X
+					</view>
 					<view class="title">
 						<view style="margin-bottom:10rpx;font-weight: bold;">
 							您无优惠券可用
@@ -89,7 +92,9 @@
 				carList:[], // 爱车列表
 				pooupCoupon:false,
 				timerNum:3,
-				timer:null
+				timer:null,
+				clickState:false
+				
 			};
 		},
 		methods: {
@@ -101,9 +106,16 @@
 				})
 			},
 			getPrice() {
+				if(this.clickState == false){
+					uni.showLoading({
+						title:"加载中"
+					})
+					this.clickState = true
 					let that = this
 					let token = uni.getStorageSync('userToken');
 					if (!token) {
+						uni.hideLoading()
+						this.clickState = false
 						uni.showModal({
 							title: "未绑定账号",
 							content: "您没有绑定京东账号,请绑定后再领取",
@@ -125,8 +137,8 @@
 					}
 					that.http.httpTokenRequest(opts, {}).then(res => {
 						if (res.data.code == 200) {
+							uni.hideLoading()
 							let freeMoveFlag = res.data.data.freeMoveFlag
-						
 							if (freeMoveFlag) {
 								// uni.showToast({
 								// 	title: "您的免费领取次数已用完",
@@ -143,6 +155,7 @@
 									}else{
 										this.pooupCoupon = false
 										this.timerNum = 3
+										this.clickState = false
 										uni.navigateToMiniProgram({
 											appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
 											path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
@@ -161,16 +174,32 @@
 								// uni.navigateTo({
 								// 	url: '/pagesA/pages/index/getPrice?orderId=' + this.freeCode.id
 								// });
-							uni.showLoading({
-								title: '加载中'
-							});
+								// uni.showLoading({
+								// 	title: '加载中'
+								// });
 								this.getCarList()
 							}
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.data.msg,
+								icon: "error",
+							});
 						}
 					})
+				}
+			},
+			closeCoupon(){
+				this.pooupCoupon = false
+				this.timerNum = 3
+				this.clickState = false
+				clearInterval(this.timer)
 			},
 			// 已领取优惠券按钮
 			goBuy(){
+				this.timerNum = 3
+				this.clickState = false
+				clearInterval(this.timer)
 				uni.navigateToMiniProgram({
 					appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
 					path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
@@ -180,13 +209,9 @@
 					success:(res)=> {
 						// 打开成功
 						this.pooupCoupon = false
-						this.timerNum = 3
-						clearInterval(this.timer)
 					},
 					fail:()=>{
 						this.pooupCoupon = false
-						this.timerNum = 3
-						clearInterval(this.timer)
 					}
 				})
 			},
@@ -475,6 +500,11 @@
 					width:100%;height:100%;
 					z-index:-11;
 				}
+				.close{
+					font-size:32rpx;
+					position: absolute;
+					top:20rpx;right:30rpx;
+				}
 				.title{
 					width:100%;
 					position: absolute;

pages/main.vue

@@ -110,6 +110,11 @@
 																} else {
 																	that.gotoBindMoveCar(scene)
 																}
+															}else{
+																uni.showToast({
+																	title: res.data.msg,
+																	icon: 'none',
+																});
 															}
 														})
 												} else {
@@ -124,6 +129,11 @@
 													icon: 'none',
 												})
 											}
+										}else{
+											uni.showToast({
+												title: res.data.msg,
+												icon: 'none',
+											});
 										}
 									})
 								}
@@ -319,6 +329,12 @@
 										})
 									}
 									
+								}else{
+									uni.hideLoading()
+									uni.showToast({
+									    title: res.data.msg,
+									    icon: "error",
+									});
 								}
 							})
 						}

pages/personal.vue

@@ -102,7 +102,7 @@ export default {
             ],
             items: [{
                     title: '待发货',
-                    icon: require('@/static/my/my2.png'),
+                    icon: require('@/static/my/my2.jpg'),
                     page: 0
                 },
                 {

pagesA/pages/index/getCoupon.vue

@@ -97,6 +97,11 @@
 								})
 							}
 						});
+					}else{
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none',
+						});
 					}
 				})
 				// uni.showToast({