shish 5 лет назад
Родитель
Сommit
2de01343e2

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/billing/affirm.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/billing/affirm.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-result.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-close.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 1 - 18
ghsApp/src/admin/billing/affirm.vue

@@ -93,7 +93,6 @@
             >
             >
               自取
               自取
             </button>
             </button>
-            <!-- <button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button> -->
             <button
             <button
               @click="courier(1)"
               @click="courier(1)"
               class="admin-button-com mini-btn"
               class="admin-button-com mini-btn"
@@ -125,7 +124,6 @@
           >
           >
             <view class="tui-title">付款方式</view>
             <view class="tui-title">付款方式</view>
             <button
             <button
-              v-if="form.customId"
               @tap="form.debt = 1"
               @tap="form.debt = 1"
               class="admin-button-com mini-btn"
               class="admin-button-com mini-btn"
               :class="form.debt == 1 ? 'blue' : 'default'"
               :class="form.debt == 1 ? 'blue' : 'default'"
@@ -190,9 +188,7 @@ import appSendTime from "@/components/app-send-time";
 import appFormSend from "@/components/app-form-send";
 import appFormSend from "@/components/app-form-send";
 const formUtil = require("@/utils/formValidation.js");
 const formUtil = require("@/utils/formValidation.js");
 import { createOrder, freight } from "@/api/order/index";
 import { createOrder, freight } from "@/api/order/index";
-// import { freight } from "@/api/order";
 import { mapActions, mapGetters } from "vuex";
 import { mapActions, mapGetters } from "vuex";
-
 export default {
 export default {
   name: "BillingAffirm", // 开单确认
   name: "BillingAffirm", // 开单确认
   components: {
   components: {
@@ -211,7 +207,7 @@ export default {
     return {
     return {
       autoLoad: false,
       autoLoad: false,
       form: {
       form: {
-        debt: 0, //付款方式 1欠款订单 0正常订单
+        debt: 1, //付款方式 1欠款订单 0正常订单
         shopId: "",
         shopId: "",
         shopName: "",
         shopName: "",
         receiveProvince: "",
         receiveProvince: "",
@@ -229,9 +225,6 @@ export default {
         product: "",
         product: "",
       },
       },
       money: "",
       money: "",
-
-      // 详细地址
-      // showRegion: false,
       showCustomer: false,
       showCustomer: false,
     };
     };
   },
   },
@@ -272,19 +265,14 @@ export default {
         this.money = this.form.sendCost;
         this.money = this.form.sendCost;
       }
       }
     },
     },
-    // api
     _getDet () {
     _getDet () {
       let data = uni.getStorageSync("modifyShopB");
       let data = uni.getStorageSync("modifyShopB");
       if (this.$util.isEmpty(data)) return;
       if (this.$util.isEmpty(data)) return;
       Object.keys(this.form).forEach((i, index) => {
       Object.keys(this.form).forEach((i, index) => {
-        // if (i != 'password') {
         this.form[i] = data[i];
         this.form[i] = data[i];
-        // }
       });
       });
     },
     },
-
     changeCustomerFn (info) {
     changeCustomerFn (info) {
-      console.log(info, "this.form");
       const product = this.selectList.map((ele) => {
       const product = this.selectList.map((ele) => {
         return {
         return {
           productId: ele.id,
           productId: ele.id,
@@ -317,7 +305,6 @@ export default {
         options.sendCost = "";
         options.sendCost = "";
       }
       }
       createOrder(options).then((res) => {
       createOrder(options).then((res) => {
-        // this.$msg("下单成功");
         this.resetSelectInfoByType(this.pageType);
         this.resetSelectInfoByType(this.pageType);
         const {
         const {
           data: { id, orderSn },
           data: { id, orderSn },
@@ -377,10 +364,6 @@ export default {
           await this.initMerchantInfo();
           await this.initMerchantInfo();
         }
         }
         formData.shopId = this.getMerchantInfo.id;
         formData.shopId = this.getMerchantInfo.id;
-
-        console.log(9999, formData);
-        // this.confirmFn(formData);
-        // let rules = rules.concat(temp);
         let checkRes = formUtil.validation(formData, []);
         let checkRes = formUtil.validation(formData, []);
         // 验证通过!
         // 验证通过!
         if (!checkRes) {
         if (!checkRes) {

Некоторые файлы не были показаны из-за большого количества измененных файлов