From cd98bf7acd16ff9ab594094d07e8fe7ff08ca6cb Mon Sep 17 00:00:00 2001
From: gaoxs <gaoxs@gaoxsdeMacBook-Pro.local>
Date: Mon, 27 Apr 2020 17:25:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BC=96=E8=BE=91=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=AF=E9=80=89=E6=8B=A9=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=B2=A1?=
 =?UTF-8?q?=E4=BA=86=202=E3=80=81=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=AA=E4=BA=BA=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=BA=86=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F=203?=
 =?UTF-8?q?=E3=80=81=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8E=BB=E6=8E=89=204=E3=80=81=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=20=E6=94=AF=E4=BB=98=E5=AE=9D=20=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=97=AE=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsList/index.vue          | 36 ++++++++--------
 pages/user/PersonalData/index.vue       |  4 +-
 pages/user/address/AddAddress/index.vue |  8 ++--
 pages/user/promotion/UserCash/index.vue | 57 ++++++++++++++++---------
 4 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 643e3b6..00ad99c 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -147,24 +147,24 @@ export default {
     !this.loading && this.get_product_list();
   },
   onHide() {
-    this.hostProduct = [];
-    this.productList = [];
-    this.Switch = true;
-    this.where = {
-      page: 1,
-      limit: 8,
-      keyword: s,
-      sid: id, //二级分类id
-      news: 0,
-      priceOrder: "",
-      salesOrder: ""
-    };
-    this.loadTitle = "";
-    this.loading = false;
-    this.loadend = false;
-    this.price = 0;
-    this.stock = 0;
-    this.nows = fals;
+    // this.hostProduct = [];
+    // this.productList = [];
+    // this.Switch = true;
+    // this.where = {
+    //   page: 1,
+    //   limit: 8,
+    //   keyword: s,
+    //   sid: id, //二级分类id
+    //   news: 0,
+    //   priceOrder: "",
+    //   salesOrder: ""
+    // };
+    // this.loadTitle = "";
+    // this.loading = false;
+    // this.loadend = false;
+    // this.price = 0;
+    // this.stock = 0;
+    // this.nows = fals;
   },
   methods: {
     goGoodsCon(item) {
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 3a1e92d..c146239 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -76,13 +76,13 @@
           <input type="text" v-else value="未绑定" disabled class="id" />
         </view>
       </view>
-      <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
+      <!-- <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
         <view>密码</view>
         <view class="input acea-row row-between-wrapper">
           <text>点击修改密码</text>
           <text class="iconfont icon-suozi"></text>
         </view>
-      </view>
+      </view> -->
     </view>
     <!--<view class="modifyBnt bg-color-red" @click="submit">保存修改</view>-->
     <!-- <view
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index 73fcda2..920aab0 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -177,7 +177,7 @@ export default {
             phone: phone,
             address: this.address,
             detail: detail,
-            is_default: isDefault,
+            is_default: isDefault ? true : false,
             post_code: ""
           };
         postAddress(data).then(function() {
@@ -193,9 +193,9 @@ export default {
               icon: "none",
               duration: 2000
             });
-            that.$yrouter.replace({
-              path: "/pages/user/PersonalData/index"
-            });
+            // that.$yrouter.replace({
+            //   path: "/pages/user/PersonalData/index"
+            // });
           }
           that.$yrouter.go(-1);
         });
diff --git a/pages/user/promotion/UserCash/index.vue b/pages/user/promotion/UserCash/index.vue
index a26b60a..09a0332 100644
--- a/pages/user/promotion/UserCash/index.vue
+++ b/pages/user/promotion/UserCash/index.vue
@@ -89,6 +89,7 @@ export default {
   },
   methods: {
     swichNav: function(index, item) {
+      console.log(item);
       this.currentTab = index;
       this.post.extract_type = item.type;
     },
@@ -102,10 +103,10 @@ export default {
         },
         function(err) {
           uni.showToast({
-				title: err.msg || err.response.data.msg,
-				icon: 'none',
-				duration: 2000
-			});
+            title: err.msg || err.response.data.msg,
+            icon: "none",
+            duration: 2000
+          });
         }
       );
     },
@@ -117,31 +118,45 @@ export default {
         cardnum = this.post.cardnum,
         weixin = this.post.weixin,
         that = this;
+      // console.log(parseFloat(money))
       if (
         parseFloat(money) > parseFloat(that.commissionCount) ||
         parseFloat(that.commissionCount) == 0
-      ) {
-        uni.showToast({
-          title: "余额不足",
-          icon: "none",
-          duration: 2000
-        });
-        return;
-      }
-      if (parseFloat(money) < parseFloat(that.minPrice)) {
-        uni.showToast({
-          title: "最低提现金额" + that.minPrice,
-          icon: "none",
-          duration: 2000
-        });
-        return;
-      }
+      )
+        return that.$dialog.message("余额不足");
+      if (parseFloat(money) < parseFloat(that.minPrice))
+        return that.$dialog.message("最低提现金额" + that.minPrice);
+      //console.log(that.post.extract_type)
       switch (that.post.extract_type) {
         case "alipay":
+          // if (!name) {
+          //   uni.showToast({
+          //     title: "请输入支付宝用户名",
+          //     icon: "none",
+          //     duration: 2000
+          //   });
+          //   return;
+          // }
+          // if (!alipay_code) {
+          //   uni.showToast({
+          //     title: "请输入支付宝账号",
+          //     icon: "none",
+          //     duration: 2000
+          //   });
+          //   return;
+          // }
+          // if (!money) {
+          //   uni.showToast({
+          //     title: "请输入提现金额",
+          //     icon: "none",
+          //     duration: 2000
+          //   });
+          //   return;
+          // }
           try {
             await this.$validator({
               name: [required(required.message("支付宝用户名"))],
-              alipayCode: [required(required.message("支付宝账号"))],
+              alipay_code: [required(required.message("支付宝账号"))],
               money: [required(required.message("提现金额"))]
             }).validate({ name, alipay_code, money });
             let save = {