1

app.json

@@ -1,12 +1,11 @@
 {
   "pages": [
-        "pages/personal_core/Realname/Realname",
+        "pages/payment/Member/Member",
         "pages/index/index",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
 "pages/personal_core/vehicle/vehicle",
   "pages/information/chat/chat",
  "pages/personal_core/remind/remind",
- 
   "pages/Setup/modify/modify",
   "pages/Landpage/Land/Land",
   "pages/zheo_More/zheo_More",
@@ -18,7 +17,7 @@
   "pages/Setup/Aboutus/Aboutus",
    "pages/Setup/security/security",
    "pages/Setup/Setuplist/Setuplist",
-    "pages/payment/Member/Member",
+
     "pages/personal_core/Album/Album",
      "pages/personal_core/requirements/requirements",
     "pages/personal_core/personaldataModifythe/personaldataModifythe",
@@ -26,11 +25,9 @@
     "pages/personal_core/home/home",
     "pages/personal_core/Realestate/Realestate",
     "pages/personal_core/Adegreein/Adegreein",
-
-
+    "pages/personal_core/Realname/Realname",
     "pages/personal_core/home_list/home_list",
     "pages/index_details/index_details",
-
     "pages/index_screen/index_screen",
     "pages/Landpage/Retrievepassword/Retrievepassword",
     "pages/register/fillTel/fillTel",

pages/chat-list/chat-list.js

@@ -151,9 +151,9 @@ Page({
               dataArr[index].create_at = data.data.create_at;
             }
 
-            if(dataArr[index].type == 2){
-              dataArr[index].content = '[图片]'
-            }
+            // if(dataArr[index].type == 2){
+            //   dataArr[index].content = '[图片]'
+            // }
          } 
      
         //新增一列

pages/payment/Member/Member.js

@@ -5,14 +5,11 @@ Page({
 
   data: {
     OccupationArray: [], // 职业-数据
-    Occupationindex: 0,  // 职业-下标
 
-    Price:'',   //价格
-    Originalprice:'',   //价格
-    day:'', //  天
+    Price: '',   //价格
+    Originalprice: '',   //价格
+    day: '', //  天
     Priceid: '', //  价格ID
-    
-    
   },
 
   onLoad: function (options) {
@@ -24,62 +21,114 @@ Page({
       pid: '0'
     };
     app.postRequest(Occupation_url, Occupation_data, function (res) {      //  职业 ajax
-      if (res.code == 201) {
-        
-          //  计算日均价  四舍五入
-        var averageprice = Number(res.data[0].discount_peice / res.data[0].day);
-        averageprice = averageprice.toFixed(2);   //取小数点后两位
-        // console.log(averageprice)
-
-        that.setData({
-          OccupationArray: res.data,
-          Price: res.data[0].total_price,  //原价
-          Originalprice: res.data[0].discount_peice,  //优惠价格
-          Priceid: res.data[0].id,  //价格ID  
-          day: averageprice,    //  日均价
-        })
-      }
+              if (res.code == 201) {
+                          
+                          var arrData = res.data;
+                          // console.log(res.data)
+                          var averageprice ='';
+
+                          for ( var i in res.data){
+
+                            if (arrData[i].day && arrData[i].day  != 0) {
+                          
+                            //  计算日均价  四舍五入
+                              averageprice = Number(arrData[i].total_price / arrData[i].day);    
+                              averageprice = averageprice.toFixed(2);   //取小数点后两位
+                              arrData[i].average_price = averageprice;
+
+                              // console.log(averageprice);
+
+                              }
+
+                          }
+
+                          that.setData({
+                            OccupationArray: arrData,
+                          })
+              }
     
     })
 
   },
 
-  OccupationEvent: function (e) {   //  职业    单项选择器
+  // OccupationEvent: function (e) {   //  职业    单项选择器
   
-    var _discount_peice =  this.data.OccupationArray[e.detail.value].discount_peice   //优惠价格
-    var _day = this.data.OccupationArray[e.detail.value].day   //天
+  //   var _discount_peice =  this.data.OccupationArray[e.detail.value].discount_peice   //优惠价格
+  //   var _day = this.data.OccupationArray[e.detail.value].day   //天
+
+  //   //  计算日均价  四舍五入
+  //   var _averageprice = Number(_discount_peice / _day);
+  //   _averageprice = _averageprice.toFixed(2);   //取小数点后两位
+
+  //   // console.log(this.data.OccupationArray[e.detail.value].id);
+  //   // console.log('picker发送选择改变，携带值为', e.detail.value)
+  //   this.setData({
+  //     Priceid:this.data.OccupationArray[e.detail.value].id, //价格ID
+  //     Price:this.data.OccupationArray[e.detail.value].total_price,  //原价
+  //     Originalprice: this.data.OccupationArray[e.detail.value].discount_peice,  //优惠价格
+  //     Occupationindex: e.detail.value,
+  //     day: _averageprice,
+  //   })
+
+  // },
+
+
+  // sfzfmclick(e) {
+
+
+  // },
+
+
 
-    //  计算日均价  四舍五入
-    var _averageprice = Number(_discount_peice / _day);
-    _averageprice = _averageprice.toFixed(2);   //取小数点后两位
 
-    // console.log(this.data.OccupationArray[e.detail.value].id);
-    // console.log('picker发送选择改变，携带值为', e.detail.value)
+  // 勾选
+  checkboxChange: function (e) {
+    console.log(e.detail.value)
+    var that =this;
+
+   var Price= ''  //价格
+   var  Originalprice=''   //原价
+   var  day='' //  天
+
+
+
+
+    var dataid = e.detail.value;
+    var data = that.data.OccupationArray;
+    // console.log(data)
+
+    for (let i = 0; i < data.length; i++) {    //已选中的数据处理
+      if (data[i].id == dataid) {
+        Price = data[i].discount_peice
+        Originalprice = data[i].total_price
+        day  =  data[i].time
+
+      }
+    }
+
     this.setData({
-      Priceid:this.data.OccupationArray[e.detail.value].id, //价格ID
-      Price:this.data.OccupationArray[e.detail.value].total_price,  //原价
-      Originalprice: this.data.OccupationArray[e.detail.value].discount_peice,  //优惠价格
-      Occupationindex: e.detail.value,
-      day: _averageprice,
+      Priceid: dataid, //价格ID
+      Price: Price,  //原价
+      Originalprice: Originalprice,  //优惠价格
+      day: day,
     })
+    
+    console.log(day);
+    console.log(Originalprice);
+    console.log(Price);
 
+    console.log('checkbox发生change事件，携带value值为：', e.detail.value);
   },
 
 
-  sfzfmclick(e) {
 
-
-  },
   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 = {
@@ -88,7 +137,7 @@ Page({
             discount_peice: _that.data.Originalprice,  //优惠
             code: res.code
           };
-          app.postRequest(payment_url, payment_data, function (res) { 
+          app.postRequest(payment_url, payment_data, function (res) {
 
             console.log(res.data)
             if (res.code == 201) {
@@ -108,12 +157,12 @@ Page({
                   })
                 },
                 fail(res) {
-                    getApp().Tips('支付失败');
+                  getApp().Tips('支付失败');
                 }
               })
               return
             }
-              getApp().Tips('支付失败');
+            getApp().Tips('支付失败');
           })
 
           // app.postRequest(p_url, p_data, function (res) {
@@ -126,7 +175,9 @@ Page({
         }
       }
     })
-  }
+  },
 
 
+
+  
 })

pages/payment/Member/Member.wxml

@@ -1,4 +1,4 @@
-<view class="Member_title">
+<!-- <view class="Member_title">
      <image src='/image/Member1.png' mode="widthFix"></image>
      <text>开通会员</text>
 </view>
@@ -30,9 +30,55 @@
     </view>
 
 
-    <!-- <view></view> -->
-    <!-- sfzfmclick -->
+
       <view class='NextStep' bindtap='pay'>立即开通</view>
 </view>
 
+ -->
+
+<view class='Tips'>未开通</view> 
+
+<view class='m_head_img'><image src="/image/m.zhif.png" mode="aspectFill"></image></view>
+
+<view class='Payment_List_box'>
+         <view class='Payment_List'>
+                     <radio-group bindchange="checkboxChange">  <!-- 勾选组件 -->
+                               
+                                <block wx:for='{{OccupationArray}}' wx:key="item">
+                                          <view  class="Payment c">
+                                                    <label class="radio">  
+                                                    
+                                                                <view class='Payment_l'>
+                                                                      <text class='Payment_l_yf'>{{item.time}}</text>
+                                                                      <text class='Payment_l_rj'  wx:if="{{item.average_price}}">日均{{item.average_price}}元</text>
+                                                                </view>
+
+                                                                <view class='Payment_r'>
+                                                                        <text>{{item.total_price}}</text>
+                                                                        <radio value="{{item.id}}" data-id="{{item.total_price}}" color=''/>     <!-- 勾选 -->
+                                                                </view>
+
+                                                      </label>
+                                          </view>
+                                </block>
+
+                      </radio-group>
+                      
+                      <view class='confirm' bindtap='pay'>确认购买</view>
+                      <view style='height:40rpx'></view>
+         </view>
+</view>
+
+
+
+<view class='Payment_List_box'>
+         <view class='Payment_List'>
+                        <view  class="Paymentwz_text">
+
+                                <view class='Payment_title'>特权说明</view>
+
+                                <view class='Payment_text'>1.解锁消息发送</view>
 
+                        </view>
+         </view>
+</view>

pages/payment/Member/Member.wxss

@@ -1,4 +1,4 @@
-
+/* 
 .Member_title{border-bottom:1px solid #ECECEC;padding:20rpx 30rpx;}
 .Member_title image{width:44rpx;display:block;margin:auto;height:0;}
 .Member_title text{display:block;font-size:28rpx;color:#292828;font-weight: 600;text-align:center;margin-top:8rpx;}
@@ -22,4 +22,62 @@
 .Member_money .m_text .m_text_pj{font-size:24rpx;color:#A7A6A6;margin-right:20rpx;float:right;position:relative;top:16rpx;}
 
 
-.NextStep{text-align:center;font-size:34rpx;color:#FFF;background: linear-gradient(to right, #FF9BCA , #FF79B8);height:100rpx;margin-top:70rpx;line-height:100rpx;border-radius:10rpx;}
+.NextStep{text-align:center;font-size:34rpx;color:#FFF;background: linear-gradient(to right, #FF9BCA , #FF79B8);height:100rpx;margin-top:70rpx;line-height:100rpx;border-radius:10rpx;} */
+
+page{background:#F4F5F7;}
+
+.Tips{background:#FED7A0;text-align:center;font-size:24rpx;color:#DDA666;padding:10rpx 0;}
+
+.m_head_img{width:100%;height:242rpx;}
+.m_head_img image{width:100%;height:100%;}
+
+.Payment_List_box{padding:20rpx;}
+.Payment_List{background:#FFF;border-radius:10rpx;padding:0 30rpx;}
+.Payment{border-bottom:1px solid #F4F4F4;padding:40rpx 0;}
+.Payment_List .Payment:last-child{border-bottom:0;}
+
+.Payment_l{float:left;}
+.Payment_l_yf{font-size:36rpx;color:#333;}
+.Payment_l_rj{font-size:24rpx;color:#999;margin-left:20rpx;}
+
+.Payment_r{float:right;}
+.Payment_r text{font-size:38rpx;color:#333;margin-right:10rpx;}
+
+radio{position:relative;top:-3rpx;}
+
+radio .wx-radio-input{
+   border-radius: 50%;/* 圆角 */
+   width: 40rpx; /* 背景的宽 */
+   height: 40rpx; /* 背景的高 */
+}
+
+/* 选中后的 背景样式 （红色背景 无边框 可根据UI需求自己修改） */
+
+
+radio .wx-radio-input.wx-radio-input-checked{
+   border: 1px solid #FF79B8; 
+   background: #FF79B8;
+
+}
+/* 选中后的 对勾样式 （白色对勾 可根据UI需求自己修改） */
+
+radio .wx-radio-input.wx-radio-input-checked::before{
+border-radius: 50%;/* 圆角 */
+   width: 40rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+   height: 40rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+   line-height: 40rpx;
+   text-align: center;
+   font-size:28rpx; /* 对勾大小 30rpx */
+   color:#fff; /* 对勾颜色 白色 */
+   background: transparent;
+   transform:translate(-50%, -50%) scale(1);
+   -webkit-transform:translate(-50%, -50%) scale(1);
+}
+
+.confirm{border:1px solid;background:linear-gradient(to right, #FF9BCA , #FF79B8);text-align:center;height:80rpx;line-height:80rpx;font-size:30rpx;color:#FFF;border-radius:10rpx;}
+
+.Paymentwz_text{border-bottom:1px solid #F4F4F4;padding:20rpx 0;}
+.Payment_title{border-bottom:1px solid #F4F4F4;font-size:30rpx;color:#333;padding-bottom:20rpx;}
+
+.Payment_title:before {content:"";display:block;position:relative;top:6rpx;left:0;width:6rpx;height:30rpx;background:#FF79B8;float:left;margin-right:10rpx;} 
+.Payment_text{font-size:28rpx;color:#999;margin-top:20rpx;}

pages/personal_core/Album/Album.wxml

@@ -19,7 +19,7 @@
                 <block wx:for='{{initial}}' wx:key="id">  
                             <view class='Album' wx:if='{{initialcode == 201}}'>
                                     <image mode="aspectFill" class='Album_img' src='{{item.img}}'  bindtap='m_showActionSheet'  wx:for-index="id"  data-id="{{item.id}}" data-src='{{item.img}}'></image>
-                                    <view class='img_text'>{{item.status_str}}</view>
+                                    <view class='img_text'  wx:if="{{item.status != 3}}">{{item.status_str}}</view>
                             </view>
                  </block>
 

pages/personal_core/personaldata/personaldata.js

@@ -16,16 +16,8 @@ Page({
     headurl: [],    //个人头像
 
 
-    photo: '',      //头像
-    // 上传的案例图片集合
-    uploadImages: [],
-    // 设置上传案例图片的最大数目
-    maxImages: 1,
-    // 案例图片数目是否达到了最大数目
-    isMaxImagesNum: false,
-    uploadimg: true,
-    
 
+ 
   },
 
 
@@ -135,115 +127,101 @@ Page({
 
   },
 
-  // enlarge:function(e){
-  //   var that = this;
-  
-  //   wx.previewImage({
-  //     urls: that.data.uploadImages,
-  //     current: e.currentTarget.dataset.src
-  //   })
 
-  // }
 
 
 
   // 上传图片
   chooseImageTap: function (e) {
     var _this = this;
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success(res) {
-
-
-        let tempFilesSize = res.tempFiles[0].size;
-
-        if (tempFilesSize > 1024 * 1024 * 3) {
 
-          wx.showModal({
-            title: '提示',
-            content: '图片不得超过3MB',
-            showCancel: false,
-          })
+    wx.showActionSheet({
+      itemList: ['预览图片', '上传头像'],
+      success(res) {
+        // console.log(res.tapIndex)
 
-          return;
-        }
+                if (res.tapIndex == 0) {       //预览所选图片
 
-        var Headportrait = res.tempFilePaths[0];
-        console.log(res.tempFilePaths[0]);
+                  // console.log(that.data.uploadImages);
+                  // console.log(e.currentTarget.dataset.src);
+              
+                  wx.previewImage({
+                    urls: [e.currentTarget.dataset.src],
+                    current: e.currentTarget.dataset.src
+                  })
 
+                }
 
-        wx.showModal({
-          title: '形象照',
-          content: '您确认上传此图片为形象照吗？',
-          success(res) {
-            if (res.confirm) {
-                        // console.log('用户点击确定')
-     
-                        // tempFilePath可以作为img标签的src属性显示图片
-                        _this.setData({
-                          uploadImages: Headportrait,
-                          isMaxImagesNum: true,
-                          uploadimg: false,
-                          photo: Headportrait,
-                        });
+                if (res.tapIndex == 1) {
+          
+                          wx.chooseImage({
+                                    count: 1,
+                                    sizeType: ['original', 'compressed'],
+                                    sourceType: ['album', 'camera'],
+                                    success(res) {
 
-                        //上传图片
-                        wx.uploadFile({
-                          url: app.globalData.url + 'my/images/headimg',
-                          filePath: Headportrait,
-                          name: 'photo',
-                          formData: {
-                            key: wx.getStorageSync('access_key'),
-                            token: wx.getStorageSync('access_token')
-                          },
-                          success: function (res) {
+                                              let tempFilesSize = res.tempFiles[0].size;
 
-                            var data = JSON.parse(res.data);
-                            console.log(data);
-                            if (data.code == 201) {
+                                              if (tempFilesSize > 1024 * 1024 * 3) {
 
-                              var _qrcode = '上传成功'
-                              getApp().Tips(_qrcode);
+                                                wx.showModal({
+                                                  title: '提示',
+                                                  content: '图片不得超过3MB',
+                                                  showCancel: false,
+                                                })
 
+                                                return;
+                                              }
 
-                              _this.onShow();
+                                              var Headportrait = res.tempFilePaths[0];
+                                              // console.log(res.tempFilePaths[0]);
 
-                              return;
+                                              //上传图片
+                                              wx.uploadFile({
+                                                url: app.globalData.url + 'my/images/headimg',
+                                                filePath: Headportrait,
+                                                name: 'photo',
+                                                formData: {
+                                                  key: wx.getStorageSync('access_key'),
+                                                  token: wx.getStorageSync('access_token')
+                                                },
+                                                success: function (res) {
 
-                            }
-                          
-                            var _qrcode2 = data.msg;
-                            getApp().Tips(_qrcode2);
-                  
+                                                  var data = JSON.parse(res.data);
+                                                  console.log(data);
+                                                  if (data.code == 201) {
 
-                          }, fail: function (d) {
+                                                    var _qrcode = '上传成功'
+                                                    getApp().Tips(_qrcode);
 
-                          }
-                        })
 
-           
-            } else if (res.cancel) {
+                                                    _this.onShow();
 
-              console.log('用户点击取消')
-            }
+                                                    return;
 
-          }
-        })
+                                                  }
 
+                                                  var _qrcode2 = data.msg;
+                                                  getApp().Tips(_qrcode2);
 
 
+                                                }, fail: function (d) {
 
+                                                }
+                                              })
 
+                                    }
+                          })
 
+                }
 
+      },
+      fail(res) {
+        console.log(res.errMsg)
       }
     })
 
-
   },
 
-
   
 })

pages/personal_core/personaldata/personaldata.wxml

@@ -10,10 +10,12 @@
                 </block>  
           </swiper> -->
 
-      <view class='Headportrait'  bindtap='chooseImageTap' wx:if='{{headurl.status ==2}}'>
+
+
+      <!-- <view class='Headportrait'  bindtap='chooseImageTap' wx:if='{{headurl.status ==2}}'>
                 <image  mode="aspectFill"  src='{{headurl.img}}' hidden='{{isMaxImagesNum}}'></image>
 
-                <!-- <text>{{headurl.status_str}}</text> -->
+           
                 <view class='Headportrait_text_box' hidden='{{isMaxImagesNum}}'>
                       <view class='Headportrait_text'>
                               <image mode="widthFix" src='/image/tx.png'></image>
@@ -25,15 +27,15 @@
                         <image mode="aspectFill" src='{{uploadImages}}'></image>
                 </view>
 
-      </view>
+      </view> -->
 
-      <view class='Headportrait'  wx:else>
+      <view class='Headportrait'  data-src='{{headurl.img}}'  bindtap='chooseImageTap'>
                 <image  mode="aspectFill"  src='{{headurl.img}}'></image>
 
-                <view class='Headportrait_text_box' wx:if='{{headurl.status ==1}}'>
+                <view class='Headportrait_text_box'  wx:if='{{headurl.status !=3}}'>
                         <view class='Headportrait_text'>
                                 <image mode="widthFix" src='/image/tx.png'></image>
-                                <text>形象照审核中...</text>
+                                <text>{{headurl.status_str}}</text>
                         </view>
                 </view>
       </view>

pages/personal_core/personaldata/personaldata.wxss

@@ -4,7 +4,7 @@
 
 .Headportrait{width:100%;height:100%;position:relative;}
 .Headportrait image{width:100%;height:100%;}
-.Headportrait_text_box{width:100%;height:100%;background:rgba(0, 0, 0, 0.5);position:absolute;top:0;left:0;}
+.Headportrait_text_box{width:100%;height:100%;background:rgba(0, 0, 0, 0.3);position:absolute;top:0;left:0;}
 .Headportrait_text{position:absolute;top:50%;left:0;width:100%;text-align:center;margin-top:-25rpx;}
 .Headportrait_text image{width:30rpx;height:0;position:relative;top:7rpx;}
 .Headportrait_text text{font-size:25rpx;color:#FFF;margin-left:10rpx;}