addxx

components/VerifyIdentity/VerifyIdentity.js

@@ -94,7 +94,7 @@ Component({
         })
       }else{
         //this.hideModal();//隐藏 
-        this.triggerEvent("formsubmit", { code: this.data.code, phone: this.data.phone, type:this.data.type });//提交表单
+        this.triggerEvent("formsubmit", { code: this.data.code, phone: this.data.phone,  });//提交表单 type:this.data.type
         this.setData({
           code:''
         });

pages/index/index.wxml

@@ -35,7 +35,7 @@
 						<view class="prosrigs flex1">
 							<view class="protitles twoline">{{item.goods_info.title}}</view>
 							<view class="priceboxs flex ali-c jus-b">
-								<text class="lsjs">零售价¥{{item.goods_info.price}} </text>
+								<!-- <text class="lsjs">零售价¥{{item.goods_info.price}} </text> -->
 								<!-- <text class="pingprice">拼拼价¥<text class="num">{{item.spell_price}}</text></text> -->
 								<view class="pingprice flex ali-c"><text>拼拼价¥</text><text class="num">{{item.spell_price?item.spell_price:300}}</text></view>
 							</view>

pages/lmping/hometwo/hometwo.wxml

@@ -75,7 +75,7 @@
 						<view class="prosrigs flex1">
 							<view class="protitles twoline">{{item.goods_info.title}}</view>
 							<view class="priceboxs flex ali-c jus-b">
-								<text class="lsjs">零售价¥{{item.goods_info.price}} </text>
+								<!-- <text class="lsjs">零售价¥{{item.goods_info.price}} </text> -->
 								<!-- <text class="pingprice">拼拼价¥<text class="num">{{item.spell_price}}</text></text> -->
 								<view class="pingprice flex ali-c"><text>拼拼价¥</text><text class="num">{{item.spell_price}}</text></view>
 							</view>

pages/shop/shops/weidian/ping_details/ping_details.js

@@ -104,6 +104,8 @@ Page({
 
     model_id_list:[],//授权成功的模板id
 
+    showaddressstate:false,
+
   },
   //关闭拼团弹窗
   onClosetwos(){
@@ -480,6 +482,15 @@ Page({
     }
   },
   address: function (e) {
+
+    if(this.data.showaddressstate){
+      return false;
+    }
+
+    this.setData({
+      showaddressstate:true,
+    })
+
     addrList({
       type: 2,//外卖地址
       // shop_lat:this.data.shop.lat,
@@ -505,6 +516,12 @@ Page({
         }
 
       }
+
+      setTimeout(() => {
+        this.setData({
+          showaddressstate:false,
+        })
+      }, 2000);
     })
 
   },

pages/shop/shops/weidian/ping_details/ping_details.wxml

@@ -48,9 +48,16 @@
 	<view class="kapian">
 		<image class="kapianbg" src="{{clientImgPath}}/images/lmping/productimgs.png"></image>
 		<view class="kapianboxs flex ali-c jus-b">
-			<view class="kapian_l ">
-				<text class="kapian_l_1">￥</text>
-				<text class="kapian_l_2">{{goods.f_disprice}}</text>
+			<view class="kapian_l ali-c">
+				<text class="kapian_l_1">拼拼价￥</text>
+				<text class="kapian_l_2">{{pingmoney}}</text>
+
+
+				<!-- <view class="ml-30 ali-c" style="">
+					<text class="kapian_l_1">原价￥</text>
+					<text style="text-decoration: line-through;color: #fff;" class="kapian_l_2">{{goods.f_disprice}}</text>
+				</view> -->
+
 			</view>
 			<view class="kapian_r" >
 				{{rentersum}}人正在拼

pages/shop/shops/weidian/ping_details/ping_details.wxss

@@ -107,7 +107,7 @@ color:white;
     /* width:240rpx; */
     height:50rpx;
     line-height: 50rpx;
-    font-size:28rpx;
+    font-size:30rpx;
     font-family:PingFang SC;
     font-weight:bold;
     justify-content: center;

pages/withdraw/withdraw.js

@@ -20,9 +20,9 @@ Page({
     inputLengths: 0,
 
     is_cash: true,
-    ismoneyshow:false,
+    ismoneyshow: false,
 
-    iShidden:false,//授权弹窗是否显示
+    iShidden: false,//授权弹窗是否显示
   },
 
   /**
@@ -37,17 +37,17 @@ Page({
       currentTab: options.bank_id ? 2 : 0,
     })
 
-    if(options.type==2){
+    if (options.type == 2) {
       wx.setNavigationBarTitle({
         title: '商家提现'
       })
     }
 
-    if( !wx.getStorageSync('userInfo') ){
-      this.setData({ hidden:true });
+    if (!wx.getStorageSync('userInfo')) {
+      this.setData({ hidden: true });
       return;
     }
-    this.setData({ hidden:false });
+    this.setData({ hidden: false });
     this.onLoadFun();
 
 
@@ -63,7 +63,7 @@ Page({
           userInfo: res.data.info,
         })
 
-        if(res.data.info.mobile=="" || res.data.info.mobile==null){
+        if (res.data.info.mobile == "" || res.data.info.mobile == null) {
           //去绑定手机号~
           wx.redirectTo({
             url: '/pages/register/register',
@@ -85,34 +85,48 @@ Page({
   },
 
   //验证身份时 用户在组件内点击提交按钮后 返回用户手机号码和验证码
-  formsubmit(data){
-    let postparams = this.data.params||{};
-    let verify = data.detail;
-    let  params ={};
-    delete verify.type; //true
-    Object.assign(params, postparams, verify);
-    this.optWithdraw(params);
+  formsubmit(data) {
+    
+    // let postparams = this.data.params || {};
+    // let verify = data.detail;
+    // let params = {};
+    // delete verify.type; //true
+    // Object.assign(params, postparams, verify);
+    // this.optWithdraw(params);
 
 
+    //提现
+    let params = {
+      code:data.detail.code,//add
+      phone:data.detail.phone,//add
+
+      type: this.data.type,
+      money: this.data.money,
+      totype: this.data.totype,
+      bank_realname: this.data.bank_realname,
+      user_bank_id: this.data.user_bank_id,
+      paw_val: this.data.paw_val,
+    };
+    this.optWithdraw(params);
   },
   /**
     * 生命周期函数--监听页面显示
     */
   onShow: function () {
-    if( !wx.getStorageSync('userInfo') ){
-      this.setData({ hidden:true });
+    if (!wx.getStorageSync('userInfo')) {
+      this.setData({ hidden: true });
       return;
     }
-    this.setData({ hidden:false });
+    this.setData({ hidden: false });
     // this.onLoadFun();
 
     //选银行卡
     let selbankcard = wx.getStorageSync('selbankcard');
-    if(selbankcard){
+    if (selbankcard) {
       wx.setStorageSync('selbankcard', "");
       this.setData({
         bank_id: selbankcard.bank_id,
-        bank:selbankcard,
+        bank: selbankcard,
       })
     }
   },
@@ -180,7 +194,7 @@ Page({
 
     var that = this;
     var type = e.currentTarget.dataset.type;
-    console.info(type,"type");
+    console.info(type, "type");
 
     if (type == 0) {
       that.setData({
@@ -201,15 +215,15 @@ Page({
 
     console.log(that.data.ismoneyshow)
   },
-  setUserInfo(e){ //点击了授权
-    if(e.detail){
+  setUserInfo(e) { //点击了授权
+    if (e.detail) {
       this.onLoadFun();
     }
   },
   onLoadFun(e) {
     let params = {
       bank_id: this.data.bank_id,
-      hasuser:true,
+      hasuser: true,
     };
 
     //获取银行卡
@@ -229,11 +243,11 @@ Page({
         bank: banklist,
         bank_realname: res.data.cash ? res.data.cash.bank_realname : realname,
         deposit: res.data.deposit,
-        account:res.data.account
+        account: res.data.account
       })
-    }).catch(err=>{
-      if( res.data.code == -10800 ){
-        this.setData({ hidden:true });
+    }).catch(err => {
+      if (res.data.code == -10800) {
+        this.setData({ hidden: true });
       }
     })
   },
@@ -311,16 +325,13 @@ Page({
           }
         })
       } else if (that.data.totype == 1 || that.data.totype == 2) {
-        let params = {
-          type: that.data.type,
-          money: that.data.money,
-          totype: that.data.totype,
-          bank_realname: that.data.bank_realname,
-          user_bank_id: that.data.user_bank_id,
+        console.info("1101");
+        this.setData({
           paw_val: paw_val,
-        };
-        this.optWithdraw(params);
-      }else{
+        })
+        this.selectComponent("#VerifyIdentity").showModal();//弹出验证身份的弹窗~
+
+      } else {
         app.showModal({
           content: "非法操作!"
         })
@@ -328,9 +339,8 @@ Page({
 
     }
   },
-
-  optWithdraw:function(params){
-    let that =this;
+  optWithdraw: function (params) {
+    let that = this;
     userWithdraw(params).then(res => {
       that.setData({
         is_cash: true
@@ -341,13 +351,13 @@ Page({
           url: "/pages/withdrawal_success/withdrawal_success?type=" + that.data.totype + "&money=" + that.data.money + "&intro=" + (that.data.bank ? that.data.bank.bank_name : '')
         })
       } else {
-        if(res.code ==-2){
+        if (res.code == -2) {
           //要求手机验证码
           that.setData({
             params: params
           })
           this.selectComponent("#VerifyIdentity").showModal();
-        }else{
+        } else {
           app.showModal({
             content: res.msg
           })