1

pages/index/index.js

@@ -133,7 +133,7 @@ Page({
         areaName: _areaname,  // 区名称
       })
 
-    } else if (_provincename == '' && _cityname == '' && _Selection == 1) {
+    } else if (_provincename == '' && _cityname == '' &&  _Selection == 1){
       that.setData({
         city: _city,
         provinceName: _provincename,  // 省名称
@@ -531,7 +531,7 @@ Page({
 
 
     wx.navigateTo({
-      url: '/pages/index_screen/index_screen?age=' + that.data.age + '&height=' + that.data.height + '&marry=' + that.data.marry + '&idmarry=' + that.data.idmarry + '&education=' + that.data.education + '&income=' + that.data.income + '&educationid=' + that.data.educationid + '&city=' + that.data.city + '&provinceName=' + that.data.provinceName + '&cityName=' + that.data.cityName + '&areaName=' + that.data.areaName + ''
+      url: '/pages/index_screen/index_screen?age=' + that.data.age + '&height=' + that.data.height + '&marry=' + that.data.marry + '&idmarry=' + that.data.idmarry + '&education=' + that.data.education + '&income=' + that.data.income + '&educationid=' + that.data.educationid +'&city=' + that.data.city +  '&provinceName=' + that.data.provinceName + '&cityName=' + that.data.cityName + '&areaName=' + that.data.areaName +  ''
     })
 
 
@@ -882,7 +882,7 @@ Page({
         break;
 
     }
-
+    
     console.log(that.data.city)
     console.log(that.data.provinceName)
     console.log(that.data.cityName)
@@ -896,7 +896,7 @@ Page({
       provincetext: '北京', //省 名字
       cityidx: 0,
       citytext: '',
-
+    
     })
 
     app.globalData.Selection = 0;    //  是否选中  
@@ -912,7 +912,7 @@ Page({
       cityidx: 0,
       citytext: '',
 
-      provinceName: '', // 省名字
+      provinceName:'', // 省名字
       city: 0,   // 市数据清空
       cityName: '',   // 市名字清空
       areaName: "",  //  区名字

pages/payment/Member/Member.js

@@ -68,52 +68,64 @@ Page({
 
   sfzfmclick(e) {
 
-    var _Priceid = this.data.Priceid
-
-
-    let payment_url = 'pay/wxpay/index';
-    let payment_data = {
-      rid: this.data.Priceid,
-      total_price: this.data.Price,  //原价
-      discount_peice: this.data.Originalprice,  //优惠
-      
-    };
-    app.postRequest(payment_url, payment_data, function (res) {      //  年龄 ajax
-
-      console.log(res.data)
-      if (res.code == 201) {
-
-        wx.requestPayment({
-          timeStamp: res.data.timeStamp,
-          nonceStr: res.data.nonceStr,
-          package: res.data.package,
-          signType: res.data.signType,
-          paySign: res.data.paySign,
-
-          success(res) {
-
-            wx.showToast({
-              title: '支付成功',
-              icon: 'success',
-              duration: 2000
-            })
-
-           },
-          fail(res) {
-            var _fail = '支付失败'
-            getApp().Tips(_fail);
-           }
-        })
-          
-          return 
 
+  },
+  pay: function () {
+    let _that = this;
+    wx.login({
+      success: function (res) {
+        console.log(res.code)
+        if (res.code) {
+          // let p_url = 'public/wxlogin';
+          // let p_data = {
+          //   code: res.code,
+          // };
+          var _Priceid = _that.data.Priceid
+          let payment_url = 'pay/wxpay/index';
+          let payment_data = {
+            rid: _that.data.Priceid,
+            total_price: _that.data.Price,  //原价
+            discount_peice: _that.data.Originalprice,  //优惠
+            code: res.code
+          };
+          app.postRequest(payment_url, payment_data, function (res) { 
+
+            console.log(res.data)
+            if (res.code == 201) {
+
+              wx.requestPayment({
+                timeStamp: res.data.timeStamp,
+                nonceStr: res.data.nonceStr,
+                package: res.data.package,
+                signType: res.data.signType,
+                paySign: res.data.paySign,
+
+                success(res) {
+                  wx.showToast({
+                    title: '支付成功',
+                    icon: 'success',
+                    duration: 2000
+                  })
+                },
+                fail(res) {
+                    getApp().Tips('支付失败');
+                }
+              })
+              return
+            }
+              getApp().Tips('支付失败');
+          })
+
+          // app.postRequest(p_url, p_data, function (res) {
+          //   console.log(res);
+          //   if (res.code == 201) {
+
+
+          //   }
+          // })
+        }
       }
-
-      var _fail = '支付失败'
-      getApp().Tips(_fail);
-
     })
-
   }
 
 

pages/payment/Member/Member.wxml

@@ -31,8 +31,8 @@
 
 
     <!-- <view></view> -->
-    
-      <view class='NextStep' bindtap='sfzfmclick'>立即开通</view>
+    <!-- sfzfmclick -->
+      <view class='NextStep' bindtap='pay'>立即开通</view>
 </view>