页面修改

src/components/commonPage/payMall.vue

@@ -46,7 +46,6 @@
         descMin: 0,
         descSecond: 0,
         descHour: 0,
-        begin: 0,
         nowDate: new Date(),
         timer: null,
         timer2: null,
@@ -71,7 +70,6 @@
             this.lastTime = new Date(res.data.data.ExpireDate)
             this.nowDate = new Date(res.data.data.NowDate)
             this.chaTime = this.lastTime - this.nowDate
-            this.begin = this.nowDate.getSeconds()
             this.timer = setInterval(() => {
               this.descTime(this.chaTime)
             }, 1000);
@@ -110,7 +108,7 @@
             }
             this.mallapipost("/api/AppletOrder/UpdateERPGoodsOrderInfo", mallMsg, res => {
               if (res.data.resultCode == 1) {
-                this.Success(res.data.message);
+                this.Success("支付成功!");
               }else{
                 this.Error(res.data.message);
               }
@@ -121,7 +119,6 @@
         }, err => {})
       },
       descTime() {
-        let day = parseInt(this.chaTime / 1000 / 60 / 60 / 24)
         let hr = parseInt(this.chaTime / 1000 / 60 / 60 % 24)
         let min = parseInt(this.chaTime / 1000 / 60 % 60)
         let sec = parseInt(this.chaTime / 1000 % 60)
@@ -129,6 +126,7 @@
         hr = hr > 9 ? hr : '0' + hr
         min = min > 9 ? min : '0' + min
         sec = sec > 9 ? sec : '0' + sec
+        console.log("min",min)
         // 控制台打印
         if (this.chaTime > 0) {
           if (hr > 0) {

src/components/mall/goodlist.vue

@@ -23,9 +23,11 @@
     color: #409EFF;
     cursor: pointer;
   }
-  .gdDis_Item{
-    background-color: #e1e3e6!important;
+
+  .gdDis_Item {
+    background-color: #e1e3e6 !important;
   }
+
 </style>
 <template>
   <div class="flexOne goodlist">
@@ -230,7 +232,7 @@
           contactName: "",
           customerId: 0,
           outBranchId: 0,
-          User_Id:0
+          User_Id: 0
         },
         statusValue: 0, //请选择
         //数据列表
@@ -321,7 +323,6 @@
     components: {
       payMall: payMall,
     },
-
     methods: {
       //清空数据
       clreaMsg() {
@@ -380,7 +381,6 @@
           this.orderMsg.TotalPrice = (parseFloat(tempSku.price) * parseFloat(this.orderMsg.Number) + parseFloat(this
             .orderMsg.FreightMoney)).toFixed(2);
         }
-
       },
       //商品分类下拉框改变
       selectChange(e) {
@@ -462,7 +462,6 @@
                 })
               }
               this.DataList = tempArray;
-              console.log(this.DataList,'datalist');
               this.msg.total = res.data.data.count;
             }
           });
@@ -545,15 +544,26 @@
           NewUserId: this.orderMsg.mallUserId,
           NewShopId: this.getLocalStorage().MallSmallShopsId
         }
-        if(this.currentGoodsObj.goods_stock>0){
-          if(DetailList[0].SpecificationList.length==0){
-            this.Error('请选择规格');
+
+        if (orderData.DetailList == null || (orderData.DetailList && orderData.DetailList.length == 0) ||
+          (orderData.DetailList && orderData.DetailList.length > 0 && orderData.DetailList[0].SpecificationList &&
+            orderData.DetailList[0].SpecificationList
+            .length == 0)) {
+          this.Error('请选择规格!');
           return;
         }
+
+        if (orderData.NewUserId == "" || Number(orderData.NewUserId) <= 0) {
+          this.Error('请选择用户!');
+          return;
         }
+        if (orderData.Consignee == "") {
+          this.Error('请选择收货地址!');
+          return;
+        }
+
         this.mallapipost("/api/AppletOrder/SetERPGoodsOrderInfo", orderData, res => {
           if (res.data.resultCode == 1) {
-
             let userInfo = this.getLocalStorage();
             var resData = res.data.data;
             this.payObj.orderId = resData.OrderId;
@@ -566,7 +576,6 @@
             this.payVisible = true;
             this.Success("下单成功!");
             this.clreaMsg();
-            // this.getGoodList();
             this.orderDialog = false;
           } else {
             this.Error(res.data.message);
@@ -631,11 +640,8 @@
               })
             }
             cb && cb(res);
-          } else {
-            // this.Info(res.data.message);
           }
         })
-
       },
       //点击新增
       addAddress() {
@@ -669,13 +675,13 @@
         });
       },
       //调用取消
-      cancelPay(){
-        this.payVisible=false;
+      cancelPay() {
+        this.payVisible = false;
         this.$refs.payChild.parentHandleclick();
       },
       //关闭
-      closeDia(){
-        this.payVisible=false;
+      closeDia() {
+        this.payVisible = false;
       }
     },
     mounted() {