体验官修改

api/request.js

@@ -12,8 +12,8 @@ import {updToken} from './updateToken'
 // wx6bd4fcc040bfa025  水感应 正式appid
 // wx9ae0c63d0c58caeb  测试appid  三猿
 // wx3056ec23196eaf02  水感应 测试
-// const api 	 = "https://api.shui.shuiganying.com/api/" // 正式环境
+const api 	 = "https://api.shui.shuiganying.com/api/" // 正式环境
-const api 	 = "https://shuitest.shuiganying.com/api/" // 测试环境
+// const api 	 = "https://shuitest.shuiganying.com/api/" // 测试环境
 const header = {
 	"Accept"	: "application/json"
 }

app.js

@@ -7,10 +7,17 @@ import api from "api/index"
 App({
     onLaunch(e) {
         let { scene } = e
-
         // 检查入口场景值
-        if(scene === 1011 || scene === 1047 || scene === 1124 || scene === 1089 || scene === 1038){
+        // 1011 扫描二维码
+        // 1017 前往小程序体验版的入口页
+        // 1025 扫描一维码
+        // 1047 扫描小程序码
+        // 1124 扫“一物一码”打开小程序
+        if(scene === 1011 || scene === 1017 || scene === 1025 || scene === 1047 || scene === 1124){
             this.globalData.isOfficial = true
+        } else {
+            this.globalData.isOfficial = false
+
         }
 
         // 检查用户登录状态

pages/recruit/exchange/exchange.js

@@ -100,8 +100,6 @@ Page({
         this.setData({
             exchangesHide: false
         })
-        wx.redirectTo({
+        wx.navigateBack()
-            url: '/pages/user/index'
-        })
     }
 })

pages/recruit/exchange/exchange.wxml

@@ -69,7 +69,7 @@
 <view class="refertoEject {{exchangesHide ? 'active' : ''}}" catchtouchmove='true'></view>
 <view class="refertoCont {{exchangesHide ? 'active' : ''}}" catchtouchmove='true'>
     <image class="refertoCont-img" src="https://cdn.shuiganying.com/images/2023/07/21/9c9f4fa4b00d825bf3eeb83df7a4b76e.png" mode="widthFix"></image>
-    <view class="refertoCont-name" hover-class="none" url="/pages/index/assess/assess?type=1" open-type="redirectTo"  bindtap="refertoTap">
+    <view class="refertoCont-name" bindtap="refertoTap">
         <text>收下啦 ~</text>
     </view>
     <image class="refertoCont-close" bindtap="refertoTap" src="https://cdn.shuiganying.com/images/2023/07/07/f9975891c1efa9b5fcd59fe33a75ed60.png" mode="widthFix"></image>

pages/recruit/exchange/exchange.wxss

@@ -254,7 +254,7 @@ button[disabled]{
     height: 100vh;
     left: 0;
     top: 0;
-    background-color: rgba(0, 0, 0, .6);
+    background-color: rgba(0, 0, 0, .8);
     z-index: 1000;
     display: none;
 }

pages/recruit/index.js

@@ -444,5 +444,11 @@ Page({
         wx.navigateTo({
             url: '/pages/index/assess/assess?type=2'
         })
+    },
+
+    onHide(){
+        this.setData({
+            followState: false
+        })
     }
 })

pages/recruit/index.wxml

@@ -439,7 +439,7 @@
     <view class="followText" wx:else>
         <view class="weChat-title">关注公众号</view>
         <image class="weChat-close" src="/static/icons/uricacidClose.png" bindtap="tapGo"></image>
-        <image class="weChat-img" src="{{recruitData.official_code}}" mode="widthFix" show-menu-by-longpress="true"></image>
+        <image class="weChat-img" src="{{recruitData.official_code}}" mode="widthFix" show-menu-by-longpress="true" bindtap="previewImage"></image>
         <view class="weChat-text"><text>请关注”水感应“公众号</text><text>以便收到活动通知</text></view>
         <view class="weChat-tips"><text>请长按识别二维码关注公众号</text></view>
     </view>

pages/recruit/poster/poster.js

@@ -25,11 +25,7 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad() {
+    onLoad() {},
-        wx.showLoading({
-          title: '请求中...',
-        })
-    },
     // 切换城市
     changeCity(){
         this.setData({

pages/recruit/poster/poster.wxml

@@ -1,5 +1,5 @@
 <view class="changeBgFixed" bindtap="changeStyle">
-    {{codeType == 'city' && !styleShow ?'切换城市':styleShow ?'关闭切换':'切换背景'}}
+    {{codeType == 'city' && !styleShow ?'切换海报':styleShow ?'关闭切换':'切换海报'}}
 </view>
 
 <view class="changeBg" wx:if="{{styleShow}}">
@@ -55,5 +55,5 @@
 
 <view class="pack-center pages-hint pages-load" wx:if="{{loading}}">
     <image src="/static/icons/loadingGif.gif"></image>
-    <view>数据加载中...</view>
+    <view>数据加载中，请耐心等待...</view>
 </view>

pages/recruit/referto/referto.wxml

@@ -31,25 +31,19 @@
                 <view class="site-input">
                     <!-- <label>收货地址 <text wx:if="{{areaData.surplus > 0}}">({{'此地区剩余名额' + areaData.surplus + '人'}})</text></label> -->
                     <view class="site-input">
-                        <label>所在省份</label>
+                        <label>收货地址</label>
-                        <picker bindchange="areasChange" value="{{areaIndex}}" range="{{areasArr}}" range-key="name">
+                        <picker bindchange="areasChange" value="{{areaIndex}}" range="{{areasArr}}" range-key="name" class="conneColor">
                             <view class="picker">
                                 {{ areasArr[areaIndex].name }}
                             </view>
                             <image src="/static/icons/orderArrow.png"></image>
                         </picker>
-                    </view> 
-                    <view class="site-input">
-                        <label>所在城市 <text wx:if="{{areaData.surplus > 0}}">({{'此地区剩余名额' + areaData.surplus + '人'}})</text></label>
                         <picker bindchange="cityDrop" value="{{cityIndex}}" range="{{cityArr}}" range-key="name" class="conneColor">
                             <view class="picker">
                                 {{ cityArr[cityIndex].name }}
                             </view>
                             <image src="/static/icons/orderArrow.png"></image>
                         </picker>
-                    </view>
-                    <view class="site-input">
-                        <label>所在区域</label>
                         <picker bindchange="regiDrop" value="{{regiIndex}}" range="{{regiArr}}" range-key="name" class="conneColor">
                             <view class="picker">
                                 {{ regiArr[regiIndex].name }}
@@ -61,6 +55,9 @@
                 <view class="site-input">
                     <input placeholder="请输入详细的收货地址" name="address" type="text"></input>
                 </view>
+                <view class="surplus" wx:if="{{areaData.surplus > 0}}">
+                    ({{'此地区剩余名额' + areaData.surplus + '人'}})    
+                </view>
                 <view class="site-btn" wx:if="{{areaData.surplus != 0}}">
                     <button form-type="submit" size="mini" disabled="{{disabled}}">提交申请</button>
                 </view>

pages/recruit/referto/referto.wxss

@@ -124,6 +124,16 @@ page {
     margin-bottom: 30rpx;
 }
 
+.site-input  picker {
+    margin-bottom: 30rpx;
+    position: relative;
+}
+
+.surplus {
+    text-align: center;
+    color: #db0000;
+}
+
 .site-input label text {
     color: #ee291b;
 }
@@ -166,7 +176,7 @@ page {
     height: 44rpx;
     position: absolute;
     right: 20rpx;
-    top: calc(50% + 22rpx);
+    top: calc(50% - 22rpx);
 }
 
 .site-btn {

pages/recruit/refertoEdit/refertoEdit.js

@@ -50,11 +50,10 @@ Page({
      */
     eitInfo(id) {
         wx.$api.recruit.Edit(id).then(res => {
-            console.log(res)
             let typeValue    = res.data.types.findIndex(val=> val.experience_type_id == res.data.enroll.experience_type.experience_type_id)
-            let areasValue = res.data.provinces.findIndex(val=> val.name == res.data.province.name),
+            let areasValue = res.data.provinces.findIndex(val=> val.name == res.data.express.province.name),
-                cityValue  = res.data.cities.findIndex(val=> val.name == res.data.city.name),
+                cityValue  = res.data.cities.findIndex(val=> val.name == res.data.express.city.name),
-                regiValue  = res.data.districts.findIndex(val=> val.name == res.data.district.name)
+                regiValue  = res.data.districts.findIndex(val=> val.name == res.data.express.district.name)
             this.setData({
                 enrollData  : res.data.enroll,
                 typesIndex  : typeValue,
@@ -65,9 +64,9 @@ Page({
                 areaIndex   : areasValue,
                 cityIndex   : cityValue,
                 regiIndex   : regiValue,
-                areaId      : res.data.province.region_id,
+                areaId      : res.data.express.province.region_id,
-                cityId      : res.data.city.region_id,
+                cityId      : res.data.express.city.region_id,
-                regiId      : res.data.district.region_id,
+                regiId      : res.data.express.district.region_id
             })
         }).catch(err => {})
     },
@@ -188,7 +187,10 @@ Page({
         let data = {
             name                : value.name,
             address             : value.address,
-            experience_type_id  : this.data.typesArr[this.data.typesIndex].experience_type_id
+            experience_type_id  : this.data.typesArr[this.data.typesIndex].experience_type_id,
+            province_id         : this.data.areaId,
+            city_id             : this.data.cityId,	
+            district_id         : this.data.regiId,
         }
         this.setData({
             disabled: true

pages/water/details/details.wxml

@@ -45,7 +45,7 @@
         </view>
         <view class="reserve-label">
             <view class="reserve-name">使用水滴</view>
-            <view class="reserve-text reserve-price">￥{{goodsData.water_number}}</view>
+            <view class="reserve-text reserve-price">{{goodsData.water_number}}</view>
         </view>
     </view>
 

project.config.json

@@ -45,7 +45,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.17.0",
-    "appid": "wx9ae0c63d0c58caeb",
+    "appid": "wx6bd4fcc040bfa025",
     "projectname": "miniprogram-92",
     "condition": {},
     "editorSetting": {

project.private.config.json

@@ -98,6 +98,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": 1011
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": 1011
                 }
             ]
         }