1

app.json

@@ -1,26 +1,22 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/onSiteActivity/onSiteActivity",
-    
+    "pages/share/share",
     "pages/targetInfo/targetInfo",
-    "pages/infoAgreement/infoAgreement",
     "pages/personInfo/personInfo",
-    "pages/share/share",
+    "pages/onSiteActivity/onSiteActivity",
     "pages/personInfoDetail/personInfoDetail",
     "pages/isAgree/isAgree",
-    "pages/paylists/paylists",
-    "pages/addRights/addRights",
     "pages/sign/sign",
     "pages/activeDetail/activeDetail",
     "pages/personal/personal",
-    
     "pages/complaint/complaint",
     "pages/myActive/myActive",
     "pages/InfoType/InfoType",
     "pages/registrationSuccess/registrationSuccess",
-    "pages/service/service"
-    
+    "pages/service/service",
+    "pages/infoAgreement/infoAgreement",
+    "pages/activeDefaultDetails/activeDefaultDetails"
   ],
   "window": {
     "backgroundTextStyle": "light",

pages/addRights/addRights.js

@@ -1,46 +1,13 @@
-// pages/addRights/addRights.js
+// pages/activeDefaultDetails/activeDefaultDetails.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    items: [{
-        name: '1',
-        value: '￥1999',
-        oldvalue: '原价:￥2500',
-        text: '立刻脱单',
-        checked: true
-      },
-      {
-        name: '2',
-        value: '￥399',
-        oldvalue: '原价:￥450',
-        text: '即将脱单',
-        checked: false
-      },
-      {
-        name: '3',
-        value: '￥199',
-        oldvalue: '原价:￥250',
-        text: '可能脱单',
-        checked: false
-      }
-    ]
-  },
-  radioChange(e) {
-    const items = this.data.items
-    const values = e.detail.value
-    for (let i = 0, lenI = items.length; i < lenI; ++i) {
-      items[i].checked = false;
-      if (values == items[i].name) {
-        items[i].checked = true
-      }
-    }
-    this.setData({
-      items: this.data.items
-    })
+
   },
+
   /**
    * 生命周期函数--监听页面加载
    */

pages/activeDefaultDetails/activeDefaultDetails.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "脱单你最牛"
+}

pages/activeDefaultDetails/activeDefaultDetails.wxml

@@ -0,0 +1,4 @@
+<view style="padding:0">
+<image src='../../images/activeDefault1.png' style="width:750rpx;height:1780rpx;"/>
+<image src='../../images/activeDefault2.png' style="width:750rpx;height:1900rpx;margin-top:-12rpx"/>
+</view>

pages/activeDefaultDetails/activeDefaultDetails.wxss

@@ -0,0 +1 @@
+/* pages/activeDefaultDetails/activeDefaultDetails.wxss */

pages/activeDetail/activeDetail.js

@@ -2,43 +2,39 @@ const app = require('../../utils/util.js');
 const tool = require('../../utils/tool.js');
 Page({
   data: {
-    isInit:false
+    isInit: false
   },
   isOk() {
     tool.isLogin().then(result => {
-      console.log('我完善信息了并获取授权了')
+      this.setData({
+        loginStatus: true
+      })
       tool.isFinishInfo().then(result2 => {
+        this.setData({
+          infoStatus: true
+        })
         tool.isFinishTargetInfo().then(redult3 => {
-          this.baoming()
+          this.setData({
+            targetInfoStatus: true
+          })
         }).catch(err => {
-          wx.showModal({
-            title: '您还未完善择偶信息',
-            showCancel: false,
-            success(res) {
-              if (res.confirm) {
-                wx.navigateTo({
-                  url: '/pages/targetInfo/targetInfo',
-                })
-              }
-            }
+          this.setData({
+            targetInfoStatus: false
           })
-          return false;
         })
       }).catch(err => {
-        wx.showModal({
-          title: '您还未完善个人信息',
-          showCancel: false,
-          success(res) {
-            if (res.confirm) {
-              wx.navigateTo({
-                url: '/pages/personInfo/personInfo',
-              })
-            }
-          }
+        this.setData({
+          infoStatus: false
         })
-        return false;
       })
     }).catch(err => {
+      this.setData({
+        loginStatus: true
+      })
+    })
+  },
+  baoming() {
+    if (!this.data.loginStatus) {
       wx.showModal({
         title: '您还未登录',
         showCancel: false,
@@ -51,65 +47,65 @@ Page({
         }
       });
       return false;
-    })
-  },
-  baoming() {
-    wx.request({
-      url: app.globalData.publicUrl + '/wx/actives/' + this.data.openid + '/' + this.data.id + '/enter',
-      method: "get",
+    }
+    if (!this.data.infoStatus) {
+      wx.showModal({
+        title: '您还未完善个人信息',
+        showCancel: false,
+        success(res) {
+          if (res.confirm) {
+            wx.redirectTo({
+              url: '/pages/personInfo/personInfo',
+            })
+          }
+        }
+      });
+      return false;
+    }
+    if (!this.data.targetInfoStatus) {
+      wx.showModal({
+        title: '您还未完善择偶信息',
+        showCancel: false,
+        success(res) {
+          if (res.confirm) {
+            wx.redirectTo({
+              url: '/pages/targetInfo/targetInfo',
+            })
+          }
+        }
+      });
+      return false;
+    }
+    wx.requestSubscribeMessage({
+      tmplIds: ['YNGZW3voCNtjvTkhi2xbbVinJkjFKcILEG7uFC_xz2Y'],
       success: (res) => {
-        if (res.data.code == 0) {
-          wx.requestSubscribeMessage({
-            tmplIds: ['YNGZW3voCNtjvTkhi2xbbVinJkjFKcILEG7uFC_xz2Y'],
-            success: (res) => {
-              console.log(res,'我订阅成功了')
+        wx.request({
+          url: app.globalData.publicUrl + '/wx/actives/' + this.data.openid + '/' + this.data.id + '/enter',
+          method: "get",
+          success: (res) => {
+            if (res.data.code == 0) {
               wx.redirectTo({
                 url: '/pages/registrationSuccess/registrationSuccess',
               })
-            },
-            fail:(err)=>{
-              console.log(err,'我订阅失败了')
+            }
+          }
+        })
+      },
+      fail: (res1) => {
+        console.log(res1, '失败了')
+        wx.request({
+          url: app.globalData.publicUrl + '/wx/actives/' + this.data.openid + '/' + this.data.id + '/enter',
+          method: "get",
+          success: (res) => {
+            if (res.data.code == 0) {
               wx.redirectTo({
                 url: '/pages/registrationSuccess/registrationSuccess',
               })
             }
-          })
-        }
+          }
+        })
       }
     })
-    // wx.requestSubscribeMessage({
-    //   tmplIds: ['YNGZW3voCNtjvTkhi2xbbVinJkjFKcILEG7uFC_xz2Y'],
-    //   success:(res)=> {
-    //     wx.request({
-    //       url: app.globalData.publicUrl + '/wx/actives/' + this.data.openid + '/' + this.data.id + '/enter',
-    //       method: "get",
-    //       success: (res) => {
-    //         if (res.data.code == 0) {
-    //           wx.redirectTo({
-    //             url: '/pages/registrationSuccess/registrationSuccess',
-    //           })
-    //         }
-    //       }
-    //     })
-    //   },
-    //   fail:(res1)=> {
-    //     console.log(res1, '失败了')
-    //     wx.request({
-    //       url: app.globalData.publicUrl + '/wx/actives/' + this.data.openid + '/' + this.data.id + '/enter',
-    //       method: "get",
-    //       success: (res) => {
-    //         if (res.data.code == 0) {
-    //           wx.redirectTo({
-    //             url: '/pages/registrationSuccess/registrationSuccess',
-    //           })
-    //         }
-    //       }
-    //     })
-    //     // wx.redirectTo({
-    //     //   url: '/pages/registrationSuccess/registrationSuccess',
-    //     // })
-    //   }
-    // })
 
   },
   async onLoad(options) {
@@ -119,8 +115,9 @@ Page({
         openid: result[0],
         sessionkey: result[1],
         activeOpenid: options.openId,
-        isInit:true
+        isInit: true
       })
+      this.isOk();
       this.getActivies(options.id);
     })
   },
@@ -137,7 +134,8 @@ Page({
             planCount: res.data.activeRoll.planCount,
             activeStart: res.data.activeRoll.activeStart,
             address: res.data.activeRoll.address,
-            remark: res.data.activeRoll.remark
+            remark: res.data.activeRoll.remark,
+            posterUrl:res.data.activeRoll.posterUrl
           })
           console.log(this.data.isOpenid)
         }

pages/activeDetail/activeDetail.wxml

@@ -1,5 +1,5 @@
 <view style="background:#fff">
-	<image src="../../images/activeimg.png" style="width:690rpx;height:360rpx;margin-left:35rpx"></image>
+	<image src="{{posterUrl}}" style="width:690rpx;height:360rpx;margin-left:35rpx"></image>
 	<view class="line">
 		<van-icon name="like-o" size="40rpx" color="#906cff" style="margin-left:35rpx;margin-bottom:35rpx" />
 		<p style='margin-left:35rpx'>已报名{{actualCount}}/{{planCount}}</p>
@@ -24,6 +24,6 @@
 	<image src="../../images/remarked.png" class="remarkImg" wx:if="{{isInit&&activeOpenid !='null'}}"></image>
 	<!--  -->
 	<view class="btn_area" wx:if="{{isInit&&(!activeOpenid||activeOpenid=='null')}}">
-		<view class="btn" bindtap="isOk">报名</view>
+		<view class="btn" bindtap="baoming">报名</view>
 	</view>
 </view>

pages/addRights/addRights.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "增加权益"
-}

pages/addRights/addRights.wxml

@@ -1,24 +0,0 @@
-<image src='../../images/add_top.png' class='img1'></image>
-<!-- <view class="">推荐</view> -->
-<image src="../../images/tuijian.png" class="tuijian"></image>
-<radio-group bindchange="radioChange">
-	<label wx:for="{{items}}">
-		<view class="{{item.checked?'radio_box1':'radio_box'}}">
-			<radio style="margin-left:30rpx;margin-top:50rpx;font-size:50rpx" color="#b186fb" value="{{item.name}}" checked="{{item.checked}}"></radio>
-			<view class="p p1">{{item.value}} </view>
-			<view class="p p2">{{item.oldvalue}} </view>
-			<view class="p p3">{{item.text}} </view>
-			<view class="p p4">查看详情</view>
-		</view>
-	</label>
-</radio-group>
-<view class="notice">
-	<view>注意事项</view>
-	<view>*占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字</view>
-	<view>*占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占</view>
-	<view>*位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字占位文字</view>
-</view>
-<view class="btn-area">
-	<view style="font-size:35rpx;line-height:75rpx">立即购买</view>
-  <view style="font-size:25rpx"><checkbox value="agree" checked="true"/>同意并遵守《月合权益购买协议》</view>
-</view>

pages/addRights/addRights.wxss

@@ -1,114 +0,0 @@
-.img1 {
-  width: 750rpx;
-  height: 391rpx;
-}
-
-.radio_box {
-  width: 650rpx;
-  border: 1px solid #f0ece9;
-  margin-left: 50rpx;
-  height: 200rpx;
-  margin-top: 30rpx;
-  border-radius: 10rpx;
-  position: relative;
-}
-
-.radio_box1 {
-  width: 650rpx;
-  border: 1px solid #eda2a1;
-  background: #fff4f4;
-  margin-left: 50rpx;
-  height: 200rpx;
-  margin-top: 30rpx;
-  border-radius: 10rpx;
-  position: relative;
-}
-
-.p {
-  position: absolute;
-}
-
-.p1 {
-  color: #fd4b49;
-  font-size: 48rpx;
-  font-weight: 800;
-  top: 40rpx;
-  left: 90rpx;
-}
-
-.p2 {
-  color: #fd4b49;
-  font-size: 25rpx;
-  /* font-weight: 800; */
-  top: 110rpx;
-  left: 100rpx;
-  text-decoration: line-through;
-}
-
-.p3 {
-  color: #fd4b49;
-  font-size: 35rpx;
-  font-weight: 600;
-  top: 60rpx;
-  left: 260rpx;
-}
-
-.p4 {
-  color: #a342ff;
-  border: 1px solid #a342ff;
-  border-radius: 5rpx;
-  top: 70rpx;
-  right: 20rpx;
-  font-size: 28rpx;
-  padding: 5rpx 10rpx;
-}
-
-.notice {
-  width: 650rpx;
-  background: #fafafa;
-  color: #999999;
-  font-size: 28rpx;
-  padding: 50rpx;
-  margin-top: 50rpx;
-  line-height: 50rpx;
-}
-
-.btn-area {
-  background: -webkit-linear-gradient(left, #c58aff, #9080f5);
-  width: 750rpx;
-  height: 150rpx;
-  text-align: center;
-  color: #fff;
-}
-checkbox .wx-checkbox-input {
-  border-radius: 50%;
-  width: 46rpx;
-  height: 46rpx;
-  background-color: #f5f5f5;
-  border: 1rpx solid rgb(122, 122, 122)
-}
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border: 1rpx solid #fff;
-  background: #fff;
-}
-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-  border-radius: 50%;
-  width: 40rpx;
-  height: 40rpx;
-  line-height: 40rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #b186fb;
-  background: transparent;
-  transform: translate(-50%, -50%) scale(1);
-  -webkit-transform: translate(-50%, -50%) scale(1);
-
-}
-.tuijian{
-  position: absolute;
-  top: 400rpx;
-  left: 40rpx;
-  width: 130rpx;
-  height: 60rpx;
-  z-index: 99999;
-}

pages/index/index.js

@@ -6,7 +6,14 @@ Page({
     arr: [],
     arr1: [],
     isInfo: false,
-    isTargetInfo: false
+    isTargetInfo: false,
+    letterStatus: true,
+    lbArr: [{
+        src: '../../images/lb2.png'
+      },
+      // {src:'../../images/lb2.png'},
+      // {src:'../../images/lb2.png'}
+    ]
   },
   // 轮播
   handleChange: function (e) {
@@ -14,6 +21,19 @@ Page({
       currentIndex: e.detail.current
     })
   },
+  // 关闭信件
+  closeLetter() {
+    console.log('1')
+    this.setData({
+      letterStatus: true
+    })
+    wx.setStorageSync('letterStatus', true)
+  },
+  goShare() {
+    wx.redirectTo({
+      url: '/pages/share/share',
+    })
+  },
   // 跳转活动详情页面
   goActive(e) {
     console.log(e)
@@ -23,6 +43,11 @@ Page({
       url: '/pages/activeDetail/activeDetail?id=' + id + '&openId=' + openId,
     })
   },
+  goActiveDefault() {
+    wx.redirectTo({
+      url: '/pages/activeDefaultDetails/activeDefaultDetails',
+    })
+  },
   // 获取活动列表
   getActivies() {
     wx.request({
@@ -39,7 +64,7 @@ Page({
           })
         }
       },
-      complete(){
+      complete() {
         wx.hideLoading();
       }
     })
@@ -56,9 +81,9 @@ Page({
           })
         }
       },
-      complete(){
+      complete() {
         wx.hideLoading();
-      } 
+      }
     })
   },
   goMy() {
@@ -66,19 +91,36 @@ Page({
       url: '/pages/personal/personal',
     })
   },
-  getIntroduce() {
+  getIntroduce(id) {
     wx.request({
       url: app.globalData.publicUrl + '/wx/member/' + this.data.openid + '/introduce',
       method: "get",
       data: {
-        introduce: this.data.introduceId
+        introduce: id
       },
       success: (res) => {
         console.log(res, '获取推荐人')
       }
     })
   },
+  getletterStauts() {
+    console.log(wx.getStorageSync('letterStatus'))
+    if (wx.getStorageSync('letterStatus')==true) {
+      console.log('我缓存里有值是1')
+      this.setData({
+        letterStatus: true
+      })
+      // this.closeLetter();
+    }else{
+      console.log('我没有缓存、')
+      this.setData({
+        letterStatus: false
+      })
+    }
+    console.log(this.data.letterStatus)
+  },
   onLoad(options) {
+    this.getletterStauts();
     wx.showLoading();
     tool.openidStatus().then(result => {
       this.setData({
@@ -87,14 +129,12 @@ Page({
       })
       this.getActivies();
       if (options.id) {
-        this.setData({
-          introduceId: options.id
-        })
-        this.getIntroduce();
+        this.getIntroduce(options.id);
       }
     })
   },
-  onShow(){
+  onShow() {
     this.getActivies();
+    this.getletterStauts();
   }
 })

pages/index/index.wxml

@@ -1,21 +1,22 @@
 <view class="swiper-cont container-fill">
 	<swiper class="imageContainer" bindchange="handleChange" previous-margin="50rpx" next-margin="50rpx" circular autoplay>
-		<block wx:for="{{3}}" wx:key="index">
+		<block wx:for="{{lbArr}}" wx:key="index">
 			<swiper-item class="item">
-				<image class="itemImg {{currentIndex == index ? 'active': ''}}" src="../../images/lb.png"></image>
+				<image class="itemImg {{currentIndex == index ? 'active': ''}}" src="{{item.src}}"></image>
 			</swiper-item>
 		</block>
 	</swiper>
-	<image src="../../images/show.png" style="width:650rpx;margin-left:50rpx;height:200rpx"></image>
+	<image src="../../images/show.png" style="width:750rpx;margin-left:0rpx;height:200rpx;margin-top:20rpx" bindtap="goShare"></image>
 	<view style="display:flex;margin-left:30rpx;margin-top:30rpx;margin-bottom:30rpx">
 		<view style='width:10rpx;height:45rpx;background-color:#986aff;margin-right:20rpx;border-radius:10rpx'></view>近期活动
 	</view>
-	<image wx:if='{{arr.length==0&&arr1.length==0}}' src="../../images/empty.png" style="width:320rpx;height:320rpx;margin-left:215rpx"></image>
-	<view wx:if='{{arr.length==0&&arr1.length==0}}' style="color:#999;width:750rpx;height:320rpx;top:550rpx;left:0rpx;text-align:center">近期还没有活动呦</view>
-	<view style="margin-bottom:150rpx">
+	<!-- <image wx:if='{{arr.length==0&&arr1.length==0}}' src="../../images/empty.png" style="width:320rpx;height:320rpx;margin-left:215rpx"></image>
+	<view wx:if='{{arr.length==0&&arr1.length==0}}' style="color:#999;width:750rpx;height:320rpx;top:550rpx;left:0rpx;text-align:center">近期还没有活动呦</view> -->
+	<view style="margin-bottom:150rpx;position:relative">
+		<image wx:if='{{arr.length==0}}' bindtap="goActiveDefault" style="width:750rpx;height:280rpx" src="../../images/activeDefault0.jpg"></image>
 		<view wx:for="{{arr}}" wx:key="index" class="box" bindtap="goActive" data-id='{{item.id}}' data-openId='{{item.openId}}'>
 			<view class="top">
-				<image src="../../images/activephoto.png" style="width:80rpx;height:80rpx;"></image>
+				<image src="../../images/logo.png" style="width:80rpx;height:80rpx;"></image>
 				<view class="text">
 					<view class="title">{{item.title}}</view>
 					<view class="remark">{{item.remark}}</view>
@@ -25,7 +26,7 @@
 				<view wx:if="{{item.enterStatus==1}}" class="btn btn1">审核通过</view>
 				<view wx:if="{{item.enterStatus==-1}}" class="btn btn1">审核失败</view>
 			</view>
-			<image src="../../images/activeimg.png" class="img2"></image>
+			<image src="{{item.posterUrl}}" class="img2"></image>
 			<view class="p1">
 				<van-icon name="clock-o" color="#a267ff" size="35rpx" />
 				<view style="margin-left:15rpx">活动时间：{{item.activeTime}}</view>
@@ -37,7 +38,7 @@
 		</view>
 		<view wx:for="{{arr1}}" wx:key="index" class="box" bindtap="goActive" data-id='{{item.id}}' data-openId='{{item.openId}}'>
 			<view class="top">
-				<image src="../../images/activephoto.png" style="width:80rpx;height:80rpx;"></image>
+				<image src="../../images/logo.png" style="width:80rpx;height:80rpx;"></image>
 				<view class="text">
 					<view class="title">{{item.title}}</view>
 					<view class="remark">{{item.remark}}</view>
@@ -47,7 +48,7 @@
 				<view wx:if="{{item.enterStatus==1}}" class="btn btn1">审核通过</view>
 				<view wx:if="{{item.enterStatus==-1}}" class="btn btn1">审核失败</view>
 			</view>
-			<image src="../../images/activeimg.png" class="img2"></image>
+			<image src="{{item.posterUrl}}" class="img2"></image>
 			<view class="p1">
 				<van-icon name="clock-o" color="#a267ff" size="35rpx" />
 				<view style="margin-left:15rpx">活动时间：{{item.activeTime}}</view>
@@ -72,4 +73,10 @@
 		<image src="../../images/unactive_bar3.png" style="width:40rpx;height:40rpx;padding-top:10rpx"></image>
 		<view>我的</view>
 	</view>
+</view>
+<view wx:if="{{!letterStatus}}" style="width:100vw;height:100vh;background:rgba(0,0,0,0.8);position:fixed;top:0rpx;text-align:center" catchtouchmove="preventTouchMove">
+	<image src="../../images/xin.png" class="xin"></image>
+	<view>
+		<van-icon name="close" color="#fff" size="50rpx" style="margin-top:20rpx" bindtap="closeLetter" />
+	</view>
 </view>

pages/index/index.wxss

@@ -132,4 +132,13 @@ page {
   font-size: 28rpx;
   position: absolute;
   bottom: 0;
+}
+.xin{
+  width: 600rpx;
+  height: 900rpx;
+  /* margin-left: 75rpx; */
+  margin-top: 50rpx;
+  /* position: absolute; */
+  /* position: fixed; */
+  /* top: 50rpx; */
 }

pages/onSiteActivity/onSiteActivity.js

@@ -117,7 +117,6 @@ Page({
     })
   },
   async onLoad(options) {
-
     tool.openidStatus().then(result => {
       this.setData({
         openid: result[0],

pages/onSiteActivity/onSiteActivity.wxml

@@ -14,7 +14,8 @@
 	</scroll-view>
 	<view class="num">
 		<view class='allnum'>嘉宾: {{member.length}}名</view>
-		<view class="tousu" bindtap="goTousu">投诉反馈</view>
+			<button id="tousu" session-from="nickName={{userInfo.nickName}}|avatarUrl={{userInfo.avatarUrl}}" open-type="contact">投诉反馈</button>
+		<!-- <view class="tousu" bindtap="goTousu">投诉反馈</view> -->
 	</view>
 </view>
 <view class="photobox">

pages/onSiteActivity/onSiteActivity.wxss

@@ -38,8 +38,8 @@
   color: #4d4d4d;
   float: left;
 }
-.tousu{
-  width: 155rpx;
+#tousu{
+  width: 180rpx;
   color: #9d69ff;
   height: 50rpx;
   border: 1px solid #9d69ff;
@@ -48,6 +48,8 @@
   line-height: 50rpx;
   text-align: center;
   margin-top: 25rpx;
+  font-size: 28rpx;
+  padding: 0;
 }
 .photobox{
   display: flex;

pages/paylists/paylists.js

@@ -1,43 +0,0 @@
-//logs.js
-const util = require('../../utils/util.js')
-
-Page({
-  data: {
-    arr: [
-      {
-        name:'韩式辣酱',
-        status:'立即脱单',
-        title:'全年五十次权益',
-        time:'2020-09-09 15:52',
-        number:'9',
-        money:'199999',
-        // class:'one',
-      },
-      {
-        name:'韩式辣酱',
-        status:'可能脱单',
-        title:'全年五十次权益',
-        time:'2020-09-09 15:52',
-        number:'已使用',
-        money:'27799',
-        // class:'two',
-      },
-      {
-        name:'韩式辣酱',
-        status:'即将脱单',
-        title:'全年五十次权益',
-        time:'2020-09-09 15:52',
-        number:'已使用',
-        money:'27799',
-        // class:'two',
-      }
-  ]
-  },
-  // onLoad: function () {
-  //   this.setData({
-  //     logs: (wx.getStorageSync('logs') || []).map(log => {
-  //       return util.formatTime(new Date(log))
-  //     })
-  //   })
-  // }
-})

pages/paylists/paylists.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "订单列表"
-}

pages/paylists/paylists.wxml

@@ -1,16 +0,0 @@
-<view class="content">
-  <view wx:for="{{arr}}" wx:key="index" class="replybox">
-    <view class="text_body">
-      <text class="name">{{item.name}}</text>
-      <text class="status">{{item.status}}</text>
-      <text class="number one">{{item.number}}</text>
-      <view class="title">{{item.title}}</view>
-      <view class="time">购买时间：{{item.time}}</view>
-    </view>
-    <view class="line"></view>
-    <view class="money_body">
-        <text>实付 </text>
-        <text style="color:#ff2c2c;font-size:45rpx;">￥{{item.money}}</text>
-    </view>
-	</view>
-</view>

pages/paylists/paylists.wxss

@@ -1,58 +0,0 @@
-page{
-  background: #fafafa;
-}
-.replybox{
-  background: #fff;
-  width: 94%;
-  margin: 20rpx 3%;
-  border-radius: 10px;
-}
-.text_body{
-  padding: 30rpx 40rpx;
-}
-.name{
-  font-size: 35rpx;
-  font-weight: 600;
-}
-.status{
-  background: #fad398;
-  border-radius: 5px;
-  padding: 0rpx 10rpx;
-  margin-left: 20rpx;
-  color: #724119;
-  font-size: 25rpx;
-}
-.one{
-  background: #8ee34e;
-  color: #fff;
-}
-.two{
-  background: #e7e7e7;
-  color: #8b8b8b;
-}
-.number{
-  float: right;
-  width: 110rpx;
-  text-align: center;
-  border-radius: 5px;
-  padding: 0rpx 8rpx;
-  font-size: 28rpx;
-}
-.title{
-  color: #4d4d4d;
-  font-size: 28rpx;
-  padding: 20rpx 0;
-}
-.time{
-  color: #666666;
-  font-size: 28rpx;
-}
-.line{
-  width:100%;
-  height:2rpx;
-  background:#eeeeee;
-}
-.money_body{
-  padding: 20rpx 30rpx;
-  text-align: right;
-}

pages/personInfo/personInfo.js

@@ -4,7 +4,7 @@ const tool = require('../../utils/tool.js');
 const COS = require('../../utils/cos.js');
 Page({
   data: {
-    myInfo:[],
+    myInfo: [],
     imgsrc: '../../images/cardModel.png',
     photo: '../../images/cardModel.png',
     questionList: [{
@@ -214,6 +214,7 @@ Page({
     });
   },
   toJx(location) {
+    console.log(location)
     wx.request({
       url: app.globalData.publicUrl + '/wx/member/' + this.data.openid + '/ocrCard',
       method: "POST",
@@ -238,44 +239,59 @@ Page({
           let constellation = 'form.constellation'
           let res1 = JSON.parse(res.data.cardMessage)
           let sexTurn = 0;
-          if (res1.words_result['性别'].words == '男') {
-            sexTurn = 1;
-          }
-          let xz = this.getXingzuo(res1.words_result['出生'].words.substring(4, 6), res1.words_result['出生'].words.substring(6, 8));
-          console.log(xz)
-          for (let i = 0; i < this.data.constellationArr.length; i++) {
-            console.log(this.data.constellationArr[i])
-            if (this.data.constellationArr[i] == xz) {
-              this.setData({
-                constellationLabel: this.data.constellationArr[i],
-                [constellation]: this.data.constellationArrValue[i]
-              })
+          console.log(res1)
+          if (res1.words_result) {
+            console.log('我识别成功了')
+            if (res1.words_result['性别'].words == '男') {
+              sexTurn = 1;
             }
-          }
-          this.setData({
-            [idFront]: location,
-            [idCard]: res1.words_result['公民身份号码'].words,
-            [name]: res1.words_result['姓名'].words,
-            [sex]: sexTurn,
-            [age]: tool.formatTime(new Date()) - res1.words_result['出生'].words.substring(0, 4),
-            [nativePlace]: res1.words_result['住址'].words,
-            [nation]: res1.words_result['民族'].words,
-            [birthday]: res1.words_result['出生'].words.substring(0, 4) + '-' + res1.words_result['出生'].words.substring(4, 6) + '-' + res1.words_result['出生'].words.substring(6, 8)
+            let xz = this.getXingzuo(res1.words_result['出生'].words.substring(4, 6), res1.words_result['出生'].words.substring(6, 8));
+            console.log(xz)
+            for (let i = 0; i < this.data.constellationArr.length; i++) {
+              console.log(this.data.constellationArr[i])
+              if (this.data.constellationArr[i] == xz) {
+                this.setData({
+                  constellationLabel: this.data.constellationArr[i],
+                  [constellation]: this.data.constellationArrValue[i]
+                })
+              }
+            }
+            this.setData({
+              [idFront]: location,
+              [idCard]: res1.words_result['公民身份号码'].words,
+              [name]: res1.words_result['姓名'].words,
+              [sex]: sexTurn,
+              [age]: tool.formatTime(new Date()) - res1.words_result['出生'].words.substring(0, 4),
+              [nativePlace]: res1.words_result['住址'].words,
+              [nation]: res1.words_result['民族'].words,
+              [birthday]: res1.words_result['出生'].words.substring(0, 4) + '-' + res1.words_result['出生'].words.substring(4, 6) + '-' + res1.words_result['出生'].words.substring(6, 8)
 
-          })
-          const items = this.data.questionList;
-          const values = res1.words_result['性别'].words;
-          for (let i = 0, lenI = items.length; i < lenI; ++i) {
-            items[i].checked = false
-            if (items[i].name == values) {
-              items[i].checked = true
+            })
+            const items = this.data.questionList;
+            const values = res1.words_result['性别'].words;
+            for (let i = 0, lenI = items.length; i < lenI; ++i) {
+              items[i].checked = false
+              if (items[i].name == values) {
+                items[i].checked = true
+              }
             }
+            this.setData({
+              questionList: this.data.questionList
+            })
+          } else {
+            console.log('我识别失败了')
+            let idFront = 'form.idFront';
+            this.setData({
+              [idFront]: location
+            })
+            console.log(this.data.form)
           }
-          this.setData({
-            questionList: this.data.questionList
-          })
+
         }
       },
+      // fail:(err)=>{
+
+      // },
       complete: () => {
         wx.hideLoading()
       }
@@ -458,13 +474,13 @@ Page({
           wx.showModal({
             title: '信息提交成功了呦',
             showCancel: false,
-            success:(res)=> {
+            success: (res) => {
               if (res.confirm) {
-                if(this.data.myInfo&&this.data.myInfo.height){
+                if (this.data.myInfo && this.data.myInfo.height) {
                   wx.redirectTo({
                     url: '/pages/index/index',
                   })
-                }else{
+                } else {
                   wx.redirectTo({
                     url: '/pages/personInfoDetail/personInfoDetail',
                   })
@@ -476,11 +492,11 @@ Page({
       }
     })
   },
-  goxy() {
-    wx.navigateTo({
-      url: '/pages/infoAgreement/infoAgreement',
-    })
-  },
+  // goxy() {
+  //   wx.navigateTo({
+  //     url: '/pages/infoAgreement/infoAgreement',
+  //   })
+  // },
   async onLoad(options) {
     this.initValidate()
     tool.openidStatus().then(result => {

pages/personInfoDetail/personInfoDetail.js

@@ -6,7 +6,7 @@ const tool = require('../../utils/tool.js');
 Page({
   data: {
     form: {
-      phone: '',
+      tel: '',
       height: '',
       weight: '',
       education: '',
@@ -57,9 +57,9 @@ Page({
     hobbyArr: []
   },
   phoneChange(e) {
-    let phone = 'form.phone'
+    let tel = 'form.tel'
     this.setData({
-      [phone]: e.detail.value
+      [tel]: e.detail.value
     })
   },
   heightPicker(e) {
@@ -318,14 +318,14 @@ Page({
           method: "POST",
           success: (res) => {
             console.log(res, '我是解析的手号');
-            let phone = 'form.phone'
+            let tel = 'form.tel'
             if (res.data.phoneNumber) {
               this.setData({
-                [phone]: res.data.phoneNumber
+                [tel]: res.data.phoneNumber
               })
             } else {
               this.setData({
-                [phone]: 0
+                [tel]: 0
               })
             }
           }
@@ -352,7 +352,7 @@ Page({
       method: "get",
       success: (res) => {
         console.log(res, '我是获取的信息')
-        let phone = 'form.phone'
+        let tel = 'form.tel'
         let height = 'form.height'
         let weight = 'form.weight'
         let education = 'form.education'
@@ -689,7 +689,7 @@ Page({
         })
         if (res.data.code == 0) {
           this.setData({
-            [phone]: res.data.info.tel,
+            [tel]: res.data.info.tel,
             [company]: res.data.info.company,
             [hobby]: res.data.info.hobby,
             [isCommon]: res.data.info.isCommon,
@@ -929,7 +929,7 @@ Page({
   //验证函数
   initValidate() {
     const rules = {
-      phone: {
+      tel: {
         required: true
       },
       height: {
@@ -1000,7 +1000,7 @@ Page({
       // }
     }
     const messages = {
-      phone: {
+      tel: {
         required: '请输入联系方式呦'
       },
       height: {

pages/personInfoDetail/personInfoDetail.wxml

@@ -3,7 +3,7 @@
 			<view class="block">
 				<view class='left' style="width:40%">咋联系你呢</view>
 				<view class='right' style="width:60%">
-					<input name="phone" wx:if="{{form.phone}}" value="{{form.phone}}" bindblur="phoneChange" placeholder="未填写" placeholder-class="iconfont icon-jianjiaohao1 icon-tubiaozhizuo-1"></input>
+					<input name="tel" wx:if="{{form.tel}}" value="{{form.tel}}" bindblur="phoneChange" placeholder="未填写" placeholder-class="iconfont icon-jianjiaohao1 icon-tubiaozhizuo-1"></input>
 					<button wx:else open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" id="photo_btn">未填写</button>
 				</view>
 			</view>

pages/personal/personal.js

@@ -5,55 +5,40 @@ Page({
     avatarUrl: '../../images/morenImg.png',
     tabArr: [{
         name: '我的信息',
-        img: '../../images/icon1.png',
+        img: '../../images/icon1.jpg',
         url: '/pages/InfoType/InfoType'
       }, {
         name: '我的活动',
-        img: '../../images/icon2.png',
+        img: '../../images/icon6.jpg',
         url: '/pages/myActive/myActive'
       }, {
         name: '心动0次',
-        img: '../../images/icon3.png',
-        url: ''
+        img: '../../images/icon3.jpg'
       }, {
         name: '被心动0次',
-        img: '../../images/icon4.png',
+        img: '../../images/icon7.jpg',
         url: ''
       },
-      // {
-      //   name: '增加权益',
-      //   img: '../../images/icon7.png',
-      //   url: '/pages/addRights/addRights'
-      // }, 
       {
         name: '推荐好友',
-        img: '../../images/icon6.png',
+        img: '../../images/icon5.jpg',
         url: '/pages/share/share'
-      },
-      // {
-      //   name: '我的订单',
-      //   img: '../../images/icon8.png',
-      //   url: '/pages/paylists/paylists'
-      // }
+      }
     ]
   },
   goTab(e) {
-    if (this.data.loginStatus) {
-      wx.navigateTo({
-        url: e.currentTarget.dataset.src
-      })
-    } else {
-      wx.showModal({
-        title: '您还未登录',
-        showCancel: false,
-        success(res) {
-          if (res.confirm) {
-            wx.redirectTo({
-              url: '/pages/personal/personal',
-            })
-          }
-        }
-      });
+    console.log(e.currentTarget.dataset.index)
+    if (e.currentTarget.dataset.index != 2 && e.currentTarget.dataset.index != 3) {
+      if (this.data.loginStatus) {
+        wx.navigateTo({
+          url: e.currentTarget.dataset.src
+        })
+      } else {
+        wx.showModal({
+          title: '您还未登录',
+          showCancel: false
+        });
+      }
     }
   },
   goIndex() {
@@ -98,7 +83,7 @@ Page({
     this.setData({
       nick: e.detail.userInfo.nickName,
       avatarUrl: e.detail.userInfo.avatarUrl,
-      loginStatus:true
+      loginStatus: true
     })
     this.upload(e.detail.userInfo.nickName, e.detail.userInfo.avatarUrl);
   },
@@ -150,35 +135,6 @@ Page({
       }
     })
   },
-  getPhoneNumber(e) {
-    console.log(e)
-    console.log(e.detail.errMsg == "getPhoneNumber:ok");
-    if (e.detail.errMsg == "getPhoneNumber:ok") {
-      wx.request({
-        url: app.globalData.publicUrl + '/wx/user/wxbfa171fdd4000e03/phone',
-        // data: {
-        //   encryptedData: e.detail.encryptedData,
-        //   iv: e.detail.iv,
-        //   sessionKey: that.data.session_key,
-        //   uid: "",
-        // },
-        data: {
-          appid: 'wxbfa171fdd4000e03',
-          sessionKey: this.data.sessionKey,
-          signature,
-          rawData,
-          encryptedData: e.detail.encryptedData,
-          iv: e.detail.iv
-        },
-        method: "get",
-        success: function (res) {
-          console.log(res);
-        }
-      })
-    }
-    // console.log(e.detail.iv)
-    // console.log(e.detail.encryptedData)
-  },
   getInfos() {
     tool.isLogin().then(res => {
       this.setData({
@@ -186,16 +142,13 @@ Page({
         nick: res.userInfo.nickName,
         loginStatus: true
       })
-      wx.hideLoading();
     }).catch(err => {
       this.setData({
         loginStatus: false
       })
-      wx.hideLoading();
     })
   },
   async onShow() {
-    wx.showLoading();
     tool.openidStatus().then(result => {
       this.setData({
         openid: result[0],

pages/personal/personal.wxml

@@ -1,5 +1,5 @@
 <view class="bj">
-	<image src="../../images/person_bj.png" style="width:750rpx;height:380rpx"></image>
+	<image src="../../images/person_bj.jpg" style="width:750rpx;height:350rpx"></image>
 	<view class="top">
 		<image class="img" src="{{avatarUrl}}"></image>
 		<view class="nick">
@@ -10,7 +10,7 @@
 		</view>
 	</view>
 	<view class="middle">
-		<view wx:for="{{tabArr}}" wx:key="index" class="block" data-src="{{item.url}}" bindtap="goTab">
+		<view wx:for="{{tabArr}}" wx:key="index" class="block" data-index='{{index}}' data-src="{{item.url}}" bindtap="goTab">
 			<image src="{{item.img}}" style="width:91rpx;height:92rpx;margin-left:30rpx"></image>
 			<view style="color:#6f7582;font-size:30rpx;margin-left:30rpx">{{item.name}}</view>
 		</view>
@@ -19,7 +19,7 @@
 <view class="tabbar">
 	<view class="tab1" bindtap="goIndex">
 		<image src="../../images/unactive_bar1.png" style="width:40rpx;height:40rpx;padding-top:10rpx"></image>
-		<view >首页</view>
+		<view>首页</view>
 	</view>
 	<view class="tab1">
 		<image src="../../images/unactive_bar2.png" style="width:40rpx;height:40rpx;padding-top:10rpx"></image>

pages/personal/personal.wxss

@@ -1,5 +1,4 @@
 .bj {
- 
   margin-bottom: 150rpx;
   /* height: 100vh; */
 }

pages/share/share.js

@@ -51,19 +51,22 @@ Page({
   },
   getEwm() {
     tool.isLogin().then(result => {
-      console.log('我完善信息了并获取授权了')
+      // console.log(result,'我完善头像了并获取授权了')
       tool.isFinishInfo().then(result2 => {
+        console.log(result2.id,'我完善了')
         tool.isFinishTargetInfo().then(redult3 => {
-          
+          wx.showLoading();
           wx.request({
-            url: app.globalData.publicUrl + '/wx/member/' + this.data.openid + '/share',
+            url: app.globalData.publicUrl + '/wx/mpuser/wxeef6678b92b6c856/qrCode',
             method: "get",
+            data: {
+              memberId:result2.id
+            },
             success: (res) => {
-              if (res.data.code == 0) {
-                this.draw(res.data.qrcode);
-              }
+              console.log(res)
+                this.draw(res.data);
             },
-            fail(){
+            fail() {
               wx.hideLoading();
             }
           })
@@ -73,7 +76,7 @@ Page({
             showCancel: false,
             success(res) {
               if (res.confirm) {
-                wx.navigateTo({
+                wx.redirectTo({
                   url: '/pages/targetInfo/targetInfo',
                 })
               }
@@ -83,11 +86,11 @@ Page({
         })
       }).catch(err => {
         wx.showModal({
-          title: '您还未完善个人信息',
+          title: '您还未完善个人或者详细信息',
           showCancel: false,
           success(res) {
             if (res.confirm) {
-              wx.navigateTo({
+              wx.redirectTo({
                 url: '/pages/personInfo/personInfo',
               })
             }
@@ -115,8 +118,8 @@ Page({
       url: qrcode,
       success: (res) => {
         const ctx = wx.createCanvasContext('myCanvasId');
-        ctx.drawImage(this.data.bj, 0, 0, 302, 256); //里面的参数无非就是图片放置的位置即图片的横纵坐标，图片的宽高
-        ctx.drawImage(res.tempFilePath, 88, 114, 114, 114);
+        ctx.drawImage(this.data.bj, 10, 0, 355, 295); //里面的参数无非就是图片放置的位置即图片的横纵坐标，图片的宽高
+        ctx.drawImage(res.tempFilePath, 106, 124, 148, 148);
         ctx.draw();
         setTimeout(() => {
           wx.canvasToTempFilePath({
@@ -140,8 +143,22 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
+  // getInfos() {
+  //   wx.request({
+  //       url: app.globalData.publicUrl + '/wx/member/' + this.data.openid + '/info',
+  //       method: "get",
+  //       success: (res) => {
+  //         console.log(res, '我是获取的信息')
+  //         if (res.data.code == 0) {
+  //           // this.setData({
+  //           //   myInfo: res.data.info
+  //           // })
+  //           this.getEwm(res.data.info.id);
+  //         }
+  //       }
+  //   })
+  // },
   onLoad: function (options) {
-    wx.showLoading();
     tool.openidStatus().then(result => {
       this.setData({
         openid: result[0],

pages/share/share.wxml

@@ -1,4 +1,4 @@
-<view style="position:relative">
-	<canvas canvas-id="myCanvasId" style="width:604rpx;height:512rpx;margin:100rpx auto 30rpx auto;"></canvas>
+<view style="position:relative;top:80rpx">
+	<canvas canvas-id="myCanvasId" style="width:750rpx;height:700rpx;"></canvas>
 	<button id="sunbmit" bindtap="save">保存二维码</button>
 </view>

pages/share/share.wxss

@@ -6,6 +6,6 @@
   line-height: 50rpx!important;
   border-radius: 50rpx!important;
   font-weight: normal!important;
-  margin: 30rpx 225rpx;
+  margin: 0rpx 235rpx;
   font-size: 30rpx;
 }

pages/targetInfo/targetInfo.js

@@ -694,19 +694,13 @@ Page({
       assetHouse: {
         required: true
       },
-      assetHouseArea: {
-        required: true
-      },
-      // assetHouseLoan: {
+      // assetHouseArea: {
       //   required: true
       // },
       assetCar: {
         required: true
       },
-      assetCarValue: {
-        required: true
-      },
-      // assetCarLoan: {
+      // assetCarValue: {
       //   required: true
       // },
       constellation: {
@@ -756,18 +750,18 @@ Page({
       assetHouse: {
         required: '请选择您可以接受的房子状态呦'
       },
-      assetHouseArea: {
-        required: '请选择您可以接受的房子面积呦'
-      },
+      // assetHouseArea: {
+      //   required: '请选择您可以接受的房子面积呦'
+      // },
       // assetHouseLoan: {
       //   required: '请选择您可以接受的房子是否有贷款'
       // },
       assetCar: {
         required: '请选择您可以接受的车子状态呦'
       },
-      assetCarValue: {
-        required: '请选择您可以接受的车子价值呦'
-      },
+      // assetCarValue: {
+      //   required: '请选择您可以接受的车子价值呦'
+      // },
       // assetCarLoan: {
       //   required: '请选择您是否可以接受的车子有贷款'
       // },

pages/targetInfo/targetInfo.wxml

@@ -3,15 +3,15 @@
 		<view class="block" style="position:relative">
 			<view class='left' style="width:40%">多大岁数你能行</view>
 			<view style="position:absolute;right:0;top:0;width:200rpx;height:100%;display:flex;">
-				<input name="ageMin" value="{{form.ageMin}}" bindblur="ageMinChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input> 至
-				<input name="ageMax" value="{{form.ageMax}}" bindblur="ageMaxChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input>
+				<input name="ageMin" type="number" value="{{form.ageMin}}" bindblur="ageMinChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input> 至
+				<input name="ageMax"  type="number" value="{{form.ageMax}}" bindblur="ageMaxChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input>
 			</view>
 		</view>
 		<view class="block" style="position:relative">
 			<view class='left' style="width:50%">多高你能行</view>
 			<view style="position:absolute;right:0;top:0;width:200rpx;height:100%;display:flex;">
-				<input name="heightMin" value="{{form.heightMin}}" bindblur="heightMinChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input> 至
-				<input name="heightMax" value="{{form.heightMax}}" bindblur="heightMaxChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input>
+				<input name="heightMin"  type="number" value="{{form.heightMin}}" bindblur="heightMinChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input> 至
+				<input name="heightMax"  type="number" value="{{form.heightMax}}" bindblur="heightMaxChange" style="width:100rpx;height:80rpx;border-bottom:1px solid #999;text-align:center;"></input>
 			</view>
 		</view>
 		<view class="block">