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

pagesA/pages/index/getCarCode.vue

@@ -334,7 +334,7 @@ export default {
 
         },
         minusMall(vo) {
-            if (this.countNum == 0) {
+            if (this.mallSelectMap[vo.id] == 0) {
                 return
             }
             this.countNum = this.countNum - 1

pagesB/pages/move-car/oneMoveCar.vue

@@ -35,12 +35,15 @@
         <div class="move-car__btn" @click="call">
             拨打车主电话通知
         </div>
-        <div class="move-car__wx">
+        <div class="move-car__btn" @click="wechat">
+            微信通知(上限3次)
+        </div>
+        <!-- <div class="move-car__wx">
             <u-checkbox-group  placement="row">
                 <u-checkbox v-model="checked" @change="changeWechat"></u-checkbox>
             </u-checkbox-group> 微信通知(上限3次)
-        </div>
-        <div class="move-car__more">
+        </div> -->
+        <div class="move-car__more" @click="">
             <div>
                 获取同款挪车牌
                 <span>
@@ -129,31 +132,49 @@ export default {
             // this.appBo.wechat = true
             
             this.appBo.moveCode = this.moveCode
-            let opts = { url: '/app/contact/notice' , method: 'post' };
+            let opts = { url: '/app/contact/phone/notice' , method: 'post' };
             this.http.httpTokenRequest(opts, this.appBo).then(res => {
                 if (res.data.code == 200) {
                     //请求成功逻辑，修改
                     this.noticeResult = res.data.data
-                    if(!this.noticeResult.allowWechat){
+                    if (this.noticeResult.allowPhone){
+                        this.list[0].name = this.noticeResult.secretPhone
+                        this.show = true;
+                    }
+                }else{
+                    this.noticeResult = res.data.data
+                    if (this.noticeResult){
                         uni.showModal({
-                            content: this.noticeResult.notAllowWechatReason,
+                            content: this.noticeResult.notAllowPhoneReason,
                         })
                     }
-                    if (!this.noticeResult.allowPhone){
+                }
+            }) 
+        },
+        wechat(){
+            this.appBo.moveCode = this.moveCode
+            let opts = { url: '/app/contact/wechat/notice' , method: 'post' };
+            this.http.httpTokenRequest(opts, this.appBo).then(res => {
+                if (res.data.code == 200) {
+                    uni.showModal({
+                        content: "微信消息发送成功",
+                    })
+                }else{
+                    //请求成功逻辑，修改
+                    this.noticeResult = res.data.data
+                    if (this.noticeResult){
                         uni.showModal({
-                            content: this.noticeResult.notAllowPhoneReason,
+                            content: this.noticeResult.notAllowWechatReason,
                         })
-                    }else {
-                        this.list[0].name = this.noticeResult.secretPhone
-                        this.show = true;
                     }
                 }
-            })
-            
-            
+            }) 
         },
         close() {
             this.show = false;
+        },
+        goMyMoveCar(){
+            
         },
         selectClick(index){
             if(index.name == "呼叫"){

pagesD/pages/personal/myAddress.vue

@@ -14,7 +14,7 @@
             </div>
             <div class="item__two">
                 <span @click="goPay(vo.id)">{{vo.address}}&emsp;{{vo.detailInfo}}</span>
-                <view @click="editAddress" style="height: 100rpx; width: 100rpx;padding-left: 40rpx;">
+                <view @click="editAddress(vo.id)" style="height: 100rpx; width: 100rpx;padding-left: 40rpx;">
                     <image style="width: 28rpx; height: 30rpx; margin: 0 auto;
                     display: table-cell;vertical-align: middle;text-align: center;" src="@/static/my/my-address1.png" />
                 </view>

pagesD/pages/personal/userInfo.vue

@@ -139,6 +139,9 @@ export default {
                  }
 
                 var d = time.getDate(); // getDate方法从 Date 对象返回一个月中的某一天 (1 ~ 31)
+                if(d < 10) {
+                   d  = '0' + d;
+                }
                 return y + '-' + M + '-' + d
             } else {
                 return '';