xuqiang 5 yıl önce
ebeveyn
işleme
5be2ae7977

+ 8 - 4
src/components/AllselloutInfo.vue

@@ -95,6 +95,8 @@
             @select="select"
             @cancel="cancels"
         >
+            <van-field required="true" border="true" label="物流单号" :value="order" @input="order = $event.detail">
+            </van-field>
         </van-action-sheet>
     </div>
 </template>
@@ -122,7 +124,8 @@ export default {
                 { id: 4, label: '中通', value: 'ZTO' }
             ],
             userId: '',
-            tradeId: ''
+            tradeId: '',
+            order: ''
         };
     },
     computed: {
@@ -306,11 +309,12 @@ export default {
         select(e) {
             this.time = e.detail;
             this.value = this.time.value;
-            console.log(this.value);
+            this.logisticNo = this.order;
+            // console.log(this.value);
             this.showLoading();
             this.$http
                 .post('orderInfo/send', {
-                    logisticNo: 'JDVA06560511791',
+                    logisticNo: this.logisticNo,
                     type: this.value,
                     orderInfoId: this.id,
                     remark: ''
@@ -329,7 +333,7 @@ export default {
                     this.hideLoading();
                     wx.showToast({
                         icon: 'none',
-                        title: '没有此订单',
+                        title: '填写正确物流单号',
                         duration: 2000
                     });
                 });

+ 8 - 5
src/pages/allselldetails.vue

@@ -244,6 +244,8 @@
             @select="select"
             @cancel="cancels"
         >
+            <van-field required="true" border="true" label="物流单号" :value="order" @input="order = $event.detail">
+            </van-field>
         </van-action-sheet>
     </div>
 </template>
@@ -259,7 +261,9 @@ export default {
             cardCaseInfo: {},
             total: '',
             tradeId: '',
+            logisticNo: '',
             value: '',
+            order: '',
             addressList: [],
             name: '',
             orderInfoId: '',
@@ -481,7 +485,7 @@ export default {
         refund() {
             wx.showModal({
                 title: '提示',
-                content: '确定同意退款?',
+                content: '确定同意退款?',
                 success: res => {
                     if (res.confirm) {
                         this.$http
@@ -504,11 +508,11 @@ export default {
         select(e) {
             this.time = e.detail;
             this.value = this.time.value;
-            // console.log(this.value);
+            this.logisticNo = this.order;
             this.showLoading();
             this.$http
                 .post('orderInfo/send', {
-                    logisticNo: 'SF1102671764014',
+                    logisticNo: this.logisticNo,
                     type: this.value,
                     orderInfoId: this.orderInfoId,
                     remark: ''
@@ -522,13 +526,12 @@ export default {
                     setTimeout(() => {
                         this.getFn();
                     }, 1000);
-                    // console.log(res);
                 })
                 .catch(e => {
                     this.hideLoading();
                     wx.showToast({
                         icon: 'none',
-                        title: '没有此订单',
+                        title: '填写正确物流单号',
                         duration: 2000
                     });
                 });

+ 6 - 1
src/pages/allsellout.vue

@@ -25,7 +25,7 @@
             image="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/wechat/kong_png_womaidaode%403x.png"
             description="暂无相关订单哦~"
         >
-            <van-button round type="danger" class="bottom-button" @click="navigateTo('/pages/store/homePage')">
+            <van-button round type="danger" class="bottom-button" @click="Lock">
                 去逛逛
             </van-button>
         </van-empty>
@@ -50,6 +50,11 @@ export default {
             this.active = item;
             this.allsellout();
         },
+        Lock() {
+            wx.switchTab({
+                url: '/pages/Home'
+            });
+        },
         allsellout() {
             this.allList = [];
             this.showLoading();

+ 3 - 1
src/pages/confirmorder.vue

@@ -143,7 +143,9 @@ export default {
                     console.log(res);
                     this.hideLoading();
                     this.id = res.id;
-                    this.navigateTo('/pages/orderdetails?id=' + this.id);
+                    wx.redirectTo({
+                        url: '/pages/orderdetails?id=' + this.id
+                    });
                 })
                 .catch(e => {
                     this.hideLoading();

+ 1 - 0
src/pages/details.vue

@@ -136,6 +136,7 @@ export default {
     },
     methods: {
         details() {
+            this.chooseIds = '';
             this.showLoading();
             this.$http
                 .get('/cardCase/showInfoMA?caseId=' + this.$mp.options.id)

+ 8 - 2
src/pages/mine.vue

@@ -74,9 +74,12 @@
             <van-grid-item text="个人设置" @click="navigateTo('/pages/setting')">
                 <img class="gird-icon" src="/native/svgs/info_icon_shezhi.svg" slot="icon" alt="" />
             </van-grid-item>
-            <van-grid-item text="常见问题" url="/pages/questions">
+            <van-grid-item text="常见问题" @click="wait">
                 <img class="gird-icon" src="/native/svgs/info_icon_wenti.svg" slot="icon" alt="" />
             </van-grid-item>
+            <!-- <van-grid-item text="常见问题" url="/pages/questions">
+                <img class="gird-icon" src="/native/svgs/info_icon_wenti.svg" slot="icon" alt="" />
+            </van-grid-item> -->
             <van-grid-item>
                 <img class="gird-icon" src="/native/svgs/info_icon_kefu.svg" slot="icon" alt="" />
                 <div slot="text">
@@ -84,9 +87,12 @@
                     <button class="grid-btn" open-type="contact" />
                 </div>
             </van-grid-item>
-            <van-grid-item text="交易规范" url="/pages/rule">
+            <van-grid-item text="交易规范" @click="wait">
                 <img class="gird-icon" src="/native/svgs/info_icon_jiaoyi.svg" slot="icon" alt="" />
             </van-grid-item>
+            <!-- <van-grid-item text="交易规范" url="/pages/rule">
+                <img class="gird-icon" src="/native/svgs/info_icon_jiaoyi.svg" slot="icon" alt="" />
+            </van-grid-item> -->
         </van-grid>
 
         <!-- <div class="invitation">