审核驳回操作

api/interfaces/recruit.js

@@ -17,13 +17,25 @@ const Enroll = (experience_id, data) => req({
     data: data
 })
 
-// 申请前置接口
+// 申请前置接口-提交
 const recruitAdd = (data) => req({
     url : "experiences/enroll",
     method: "POST",
     data: data
 })
 
+// 编辑报名前置接口
+const Edit = (enroll_id) => req({
+    url : "experiences/enroll/" + enroll_id + "/edit"
+})
+
+// 编辑报名资料-提交
+const EditPut = (enroll_id, data) => req({
+    url : "experiences/enroll/" + enroll_id,
+    method: "PUT",
+    data: data
+})
+
 //小程序入库用户数据(微信授权)
 const wechatMini = (data) => req({
     url : "user/socialite/login/wechat/mini/add",
@@ -94,6 +106,8 @@ export default ({
     index,
     Enroll,
     recruitAdd,
+    Edit,
+    EditPut,
     wechatMini,
     signCalendar,
     signLabor,

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.json

@@ -37,7 +37,8 @@
         "pages/recruit/dailyList/dailyList",
         "pages/water/index",
         "pages/recruit/expressTrack/expressTrack",
-        "pages/recruit/unveil/unveil"
+        "pages/recruit/unveil/unveil",
+        "pages/recruit/refertoEdit/refertoEdit"
     ],
     "window": {
         "backgroundTextStyle": "light",

pages/recruit/index.js

@@ -172,6 +172,15 @@ Page({
         })
     },
 
+    /**
+     * 编辑申请
+     */
+    editGo() {
+        wx.navigateTo({
+            url: './refertoEdit/refertoEdit?id=' + this.data.recruitData.experience_id
+        })
+    },
+
     rejectGo() {
         wx.showModal({
             title: '驳回原因提示',

pages/recruit/index.wxml

@@ -57,9 +57,14 @@
                 <!-- 按钮 -->
                 <view class="recruit-btn">
                     <block wx:if="{{recruitData.is_show_button}}">
-                        <image class="recruit-btn-img {{recruitData.can.status == 2 || recruitData.can.status == 3 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}" src="https://cdn.shuiganying.com/images/2023/07/07/327b691cd8129d8945790fd2e7c34497.png" mode="widthFix"></image>
+                        <image wx:if="{{recruitData.can.status == 3}}" class="recruit-btn-img {{recruitData.can.is_return != 0 ? 'active' : ''}}" src="https://cdn.shuiganying.com/images/2023/07/07/327b691cd8129d8945790fd2e7c34497.png" mode="widthFix"></image>
+                        <image wx:else class="recruit-btn-img {{recruitData.can.status == 2 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}" src="https://cdn.shuiganying.com/images/2023/07/07/327b691cd8129d8945790fd2e7c34497.png" mode="widthFix"></image>
                         <!-- 0可以申请  1需要面检测  2待审核  3驳回  4待发货  5签收-查看物流  6打卡  7第二次面  8 完成  90  未开始   91已结束  92活动关闭 -->
-                        <view class="recruit-btn-text" wx:if="{{recruitData.can.status == 2 || recruitData.can.status == 3 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}">{{recruitData.can.text}}</view>
+                        <view class="recruit-btn-text" wx:if="{{recruitData.can.status == 2 || recruitData.can.status == 4 || recruitData.can.status == 8 || recruitData.can.status == 90 || recruitData.can.status == 91  || recruitData.can.status == 92 ? 'active' : ''}}">{{recruitData.can.text}}</view>
+                        <view class="recruit-btn-text" wx:elif="{{recruitData.can.status == 3}}">
+                            <view bindtap="editGo" wx:if="{{recruitData.can.is_return == 0}}">{{recruitData.can.text}}，重新编辑报名</view>
+                            <view wx:else>{{recruitData.can.text}}</view>
+                        </view>
                         <view class="recruit-btn-text" bindtap="applyGo" wx:else>{{recruitData.can.text}}</view>
                     </block>
                     <block wx:else>
@@ -410,7 +415,7 @@
     <view class="followText">
         <view class="weChat-title">关注公众号</view>
         <image class="weChat-close" src="/static/icons/uricacidClose.png" bindtap="tapGo"></image>
-        <image class="weChat-img" src="/static/imgs/weChat_code.jpg" mode="widthFix"></image>
+        <image class="weChat-img" src="{{recruitData.official_code}}" mode="widthFix"></image>
         <view class="weChat-text"><text>请关注”水感应“公众号</text><text>以便收到活动通知</text></view>
         <view class="weChat-tips"><text>请截图保存二维码识别关注</text></view>
     </view>

pages/recruit/refertoEdit/refertoEdit.js

@@ -0,0 +1,133 @@
+// pages/recruit/referto/referto.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        enrollData   : '',
+        paySuccess   : false,
+        experienceId: '',
+        typesArr   : [],
+        typesIndex : 0,
+        refertoStatus: false,
+        checkStatus : false,
+                
+        // 市级选择
+        cityArr    : [],
+        cityId     : 0,
+        cityIndex  : 0,
+
+        // 区域选择
+        regiArr    : [],
+        regiId     : 0,
+        regiIndex  : 0
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            experienceId: options.id
+        })
+        // 编辑报名前置接口
+        this.eitInfo(options.id);
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() { },
+
+     /**
+     * 申请前置接口
+     */
+    eitInfo(id) {
+        wx.$api.recruit.Edit(id).then(res => {
+            let typeValue = res.data.types.findIndex(val=> val.experience_type_id == res.data.enroll.experience_type.experience_type_id),
+                cityValue = res.data.areas.findIndex(val=> val.city_id == res.data.enroll.experience_area.city_id)
+            this.setData({
+                enrollData: res.data.enroll,
+                typesIndex: typeValue,
+                cityIndex : cityValue,
+                typesArr   : res.data.types,
+                cityArr    : res.data.areas,
+            })
+        }).catch(err => {})
+    },
+    
+    /**
+     * 市级下拉筛选
+     */
+    cityDrop(e) {
+        let city     = this.data.cityArr,
+            index    = e.detail.value,
+            citycode = city[index].city_id
+        if (index != this.data.cityIndex) {
+            this.setData({
+                cityIndex : index,
+                cityId   : citycode
+            })
+        }
+    },
+
+    /**
+     * 体验内容筛选
+     */
+    tasteDrop(e) {
+        let newIndex = e.detail.value
+        this.setData({
+            typesIndex : newIndex
+        })
+    },
+
+    /**
+     * 提交表单
+     */
+    siteform(e) {
+        let value  = e.detail.value
+
+        let data = {
+            name                : value.name,
+            address             : value.address,
+            experience_type_id  : this.data.typesArr[this.data.typesIndex].experience_type_id
+        }
+        this.setData({
+            disabled: true
+        })
+        wx.$api.recruit.EditPut(this.data.enrollData.experience_area_enroll_id,data).then(res => {
+            this.setData({
+                checkStatus: true
+            })
+        }).catch(() =>{
+            this.setData({
+                disabled: false
+            })
+        })
+    },
+
+    /**
+     * 关闭弹框，跳转首页
+     */
+    refertoTap() {
+        this.setData({
+            refertoStatus: false
+        })
+        wx.switchTab({
+            url: '/pages/recruit/index'
+        })
+    },
+
+    /**
+     * 申请体验官成功后，弹出
+     */
+    checkTap() {
+        this.setData({
+            checkStatus: false
+        })
+        wx.switchTab({
+            url: '/pages/recruit/index'
+        })
+    }
+})

pages/recruit/refertoEdit/refertoEdit.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "申请体验官 编辑"
+}

pages/recruit/refertoEdit/refertoEdit.wxml

@@ -0,0 +1,70 @@
+<image class="referto-img" src="https://cdn.shuiganying.com/images/2023/07/07/80b66f6a79ff3ef3dc6b32ae1b9d1abf.png" mode="widthFix"></image>
+<view class="referto-cont">
+    <view class="referto-blue">
+        <view class="referto-drop"><text></text><text></text><text></text>
+            <image src="/static/icons/refertoEdit.png" mode="widthFix"></image>
+        </view>
+        <view class="referto-white">
+            <view class="referto-title">
+                <view class="referto-title-name"><text>活动报名</text></view>
+                <view class="referto-title-tips">activity</view>
+            </view>
+            <form bindsubmit="siteform" class="site-form">
+                <view class="picker-remark">
+                    <label>体验类型</label>
+                    <picker bindchange="tasteDrop" value="{{typesIndex}}" range="{{typesArr}}" range-key="name" class="conneColor">
+                        <view class="picker">
+                            {{ typesArr[typesIndex].name }}
+                        </view>
+                        <view class="picker-text" wx:if="{{typesArr[typesIndex].remark}}">{{ typesArr[typesIndex].remark }}</view>
+                        <image src="/static/icons/orderArrow.png"></image>
+                    </picker>
+                </view>
+                <view class="site-input">
+                    <label>姓名</label>
+                    <input placeholder="请输入姓名" name="name" type="text" value="{{enrollData.express.name}}"></input>
+                </view>
+                <view class="site-input">
+                    <label>所选城市 <text wx:if="{{cityIndex > 0}}">({{'此地区剩余名额' + cityArr[cityIndex].surplus + '人'}})</text></label>
+                    <picker bindchange="cityDrop" value="{{cityIndex}}" range="{{cityArr}}" range-key="city" class="conneColor" disabled>
+                        <view class="picker" style="color: #999;">
+                            {{ cityArr[cityIndex].city }}
+                        </view>
+                    </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 }}
+                        </view>
+                        <image src="/static/icons/orderArrow.png"></image>
+                    </picker>
+                </view> -->
+                <view class="site-input">
+                    <input placeholder="请输入详细地址" name="address" type="text" value="{{enrollData.express.address}}"></input>
+                </view>
+                <view class="site-btn" wx:if="{{cityArr[cityIndex].surplus != 0}}">
+                    <button form-type="submit" size="mini" disabled="{{disabled}}">提交申请</button>
+                </view>
+                <view class="site-btn active" wx:else>
+                    <text>剩余名额为0，不可申请</text>
+                </view>
+            </form>
+            <image class="referto-back" src="https://cdn.shuiganying.com/images/2023/07/07/5a376e923d0ba914c307d7f33da2ab7d.png" mode="widthFix"></image>
+        </view>
+    </view>
+</view>
+
+<view class="checkEject {{checkStatus ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="checkCont {{checkStatus ? 'active' : ''}}" catchtouchmove='true'>
+    <image class="checkCont-img" src="https://cdn.shuiganying.com/images/2023/07/18/fc2b4bf3d54efc69805ecd5b5a2fe357.png" mode="widthFix"></image>
+    <view class="checkCont-name" hover-class="none" url="/pages/index/assess/assess?type=1" open-type="redirectTo">
+        <image src="https://cdn.shuiganying.com/images/2023/07/18/fd090a84d2439655de52104ff75efc0a.png" mode="widthFix"></image>
+        <view class="checkCont-text"> 
+            <view class="checkCont-text-title">修改成功，等待审核</view>
+            <view class="checkCont-text-tips">水漾肌肤天然滋润，足量使用，效果更佳！</view>
+            <view class="checkCont-text-go" bindtap="checkTap">知道了</view>
+        </view>
+    </view>
+</view>

pages/recruit/refertoEdit/refertoEdit.wxss

@@ -0,0 +1,354 @@
+page {
+    background-image: linear-gradient(to top, #6fbaf0, #6fbaf0);
+    padding-bottom: 50rpx;
+}
+
+.referto-img {
+    width: 100%;
+}
+
+.referto-cont {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.referto-blue {
+    background-color: #0e55ad;
+    border-radius: 20rpx;
+    position: relative;
+    top: -20rpx;
+    z-index: 9;
+}
+
+.referto-blue::after,
+.referto-blue::before {
+    position: absolute;
+    content: '';
+    background-color: rgba(14, 85, 173, .2);
+    left: 20rpx;
+    border-radius: 20rpx 20rpx 0 0;
+}
+.referto-blue::after {
+    z-index: -2;
+    width: calc(100% - 40rpx);
+    left: 20rpx;
+    top: -20rpx;
+    height: 20rpx;
+}
+.referto-blue::before {
+    z-index: -1;
+    width: calc(100% - 80rpx);
+    left: 40rpx;
+    top: -40rpx;
+    height: 40rpx;
+}
+
+.referto-drop {
+    padding: 30rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.referto-drop image {
+    width: 40rpx;
+    position: absolute;
+    right: 30rpx;
+}
+
+.referto-drop text {
+    display: inline-block;
+    width: 20rpx;
+    height: 20rpx;
+    border-radius: 50%;
+    background-color: #ffaf59;
+    margin-right: 20rpx;
+}
+
+.referto-drop text:nth-child(2) {
+    background-color: #7fe2ff;
+}
+
+.referto-drop text:nth-child(3) {
+    background-color: #ffffff;
+}
+
+.referto-white {
+    background: white;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    position: relative;
+}
+
+
+.referto-back {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 50%;
+}
+
+.referto-title {
+    margin-bottom: 30rpx;
+    display: flex;
+}
+
+.referto-title-name {
+    flex: 1;
+    display: inline-block;
+}
+
+.referto-title-name text {
+    background-color: #1e6dce;
+    padding: 0 30rpx;
+    line-height: 68rpx;
+    font-size: 34rpx;
+    border-radius: 20rpx 0 20rpx 0;
+    color: #fff;
+    display: inline-block;
+}
+
+.referto-title-tips {
+    text-transform: uppercase; 
+    font-size: 44rpx;
+    line-height: 68rpx;
+    color: #eef6ff;
+}
+
+.site-form {
+    display: block;
+}
+
+.site-input {
+    position: relative;
+    line-height: 90rpx;
+    margin-bottom: 30rpx;
+}
+
+.site-input label text {
+    color: #ee291b;
+}
+
+.picker-text {
+    color: #ee291b;
+    font-size: 26rpx;
+    margin-top: 20rpx;
+}
+
+.picker-remark picker {
+    position: relative;
+    width: 100%;
+    background-color: #f9fcff;
+    padding: 30rpx 80rpx 30rpx 30rpx;
+    box-sizing: border-box;
+    margin-top: 30rpx;
+}
+
+.picker-remark image {
+    width: 44rpx;
+    height: 44rpx;
+    position: absolute;
+    right: 20rpx;
+    top: calc(50% - 22rpx);
+}
+
+
+.site-input input,
+.site-input picker {
+    width: 100%;
+    height: 90rpx;
+    background-color: #f9fcff;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.site-input image {
+    width: 44rpx;
+    height: 44rpx;
+    position: absolute;
+    right: 20rpx;
+    top: calc(50% + 22rpx);
+}
+
+.site-btn {
+    padding: 20rpx 30rpx;
+    margin: 60rpx 0;
+    text-align: center;
+    position: relative;
+    z-index: 2;
+}
+
+.site-btn button[size="mini"],
+.site-btn text {
+    display: inline-block;
+    background: #1e6dce;
+    border-radius: 80rpx;
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 30rpx;
+    color: white;
+    padding: 0 80rpx;
+}
+
+.site-btn.active text {
+    background: #b4b4b4;
+}
+
+.site-btn button[disabled] {
+    background: #7789ff !important;
+    color: #fff !important;
+}
+
+.site-switch {
+    font-size: 32rpx;
+    margin: 30rpx;
+    display: flex;
+    line-height: 40rpx;
+}
+
+.site-switch text {
+    flex: 1;
+}
+
+.site-switch-active {
+    color: #797979;
+}
+
+.site-input textarea {
+    background-color: #f9fcff;
+    padding: 30rpx;
+    width: 100%;
+    box-sizing: border-box;
+    min-height: 40rpx;
+}
+
+.refertoEject {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .6);
+    z-index: 1000;
+    display: none;
+}
+
+.refertoEject.active {
+    display: block;
+}
+
+.refertoCont {
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 10000;
+    padding: 0 10%;
+    box-sizing: border-box;
+    text-align: center;
+    display: none;
+}
+
+.refertoCont.active {
+    display: -webkit-box;
+}
+
+.refertoCont-name {
+    width: 100%;
+    /* background-image: linear-gradient(to bottom, #ffb70a, #ff7e1c);
+    color: #fff; */
+    display: inline-block;
+    margin-bottom: 50rpx;
+    /* padding: 0 60rpx; */
+    /* border: 4rpx solid #ffffff; */
+    line-height: 80rpx;
+    /* border-radius: 90rpx; */
+    /* font-size: 34rpx; */
+}
+
+.refertoCont-name image,
+.refertoCont-img {
+    width: 100%;
+}
+
+.refertoCont-close {
+    width: 68rpx;
+    display: block;
+    margin: 0 auto;
+}
+
+/* 申请成功弹出 */
+.checkEject {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .6);
+    z-index: 1000;
+    display: none;
+}
+
+.checkEject.active {
+    display: block;
+}
+
+.checkCont {
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 10000;
+    box-sizing: border-box;
+    text-align: center;
+    display: none;
+}
+
+.checkCont.active {
+    display: -webkit-box;
+}
+
+.checkCont-img,
+.checkCont-name  {
+    position: absolute;
+    width: 80%;
+    left: 10%;
+    top: 30%;
+}
+
+.checkCont-name {
+    z-index: 9;
+    padding: 120rpx 140rpx;
+    box-sizing: border-box;
+}
+
+.checkCont-name image {
+    width: 70%;
+}
+
+.checkCont-text {
+    margin-top: 20rpx;
+}
+
+.checkCont-text-title {
+    font-weight: 600;
+    font-size: 34rpx;
+}
+
+.checkCont-text-tips {
+    color: #666666;
+    line-height: 44rpx;
+    margin: 25rpx 0;
+}
+
+.checkCont-text-go {
+    background-color: #ff4751;
+    color: #fff;
+    border-radius: 80rpx;
+    line-height: 74rpx;
+}

project.config.json

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