版本提交
Showing
27 changed files
with
540 additions
and
178 deletions
| ... | @@ -26,6 +26,7 @@ App({ | ... | @@ -26,6 +26,7 @@ App({ |
| 26 | wxcode: store.getItem("wxcode"), | 26 | wxcode: store.getItem("wxcode"), |
| 27 | tlMemberCode: "", | 27 | tlMemberCode: "", |
| 28 | giftInfo: null, // 来自 gift-shop | 28 | giftInfo: null, // 来自 gift-shop |
| 29 | addressEditInfo: null, // 编辑时的临时对象 | ||
| 29 | }, | 30 | }, |
| 30 | //重写分享方法 | 31 | //重写分享方法 |
| 31 | share: function () { | 32 | share: function () { | ... | ... |
| 1 | { | 1 | { |
| 2 | "pages": [ | 2 | "pages": [ |
| 3 | "pages/user-center/user-center", | ||
| 3 | "pages/gift-shop/gift-shop", | 4 | "pages/gift-shop/gift-shop", |
| 4 | "pages/index/index", | 5 | "pages/index/index", |
| 5 | "pages/user-center/user-center", | ||
| 6 | "pages/gift-detail/gift-detail", | 6 | "pages/gift-detail/gift-detail", |
| 7 | "pages/scan-result/scan-result", | 7 | "pages/scan-result/scan-result", |
| 8 | "pages/contact/contact", | 8 | "pages/contact/contact", |
| ... | @@ -61,6 +61,7 @@ | ... | @@ -61,6 +61,7 @@ |
| 61 | "gift-rank-tips-comp": "../../component/gift-rank-tips-comp/gift-rank-tips-comp", | 61 | "gift-rank-tips-comp": "../../component/gift-rank-tips-comp/gift-rank-tips-comp", |
| 62 | "gift-sign-tips-comp": "../../component/gift-sign-tips-comp/gift-sign-tips-comp", | 62 | "gift-sign-tips-comp": "../../component/gift-sign-tips-comp/gift-sign-tips-comp", |
| 63 | "order-submit-success-tips-comp": "../../component/order-submit-success-tips-comp/order-submit-success-tips-comp", | 63 | "order-submit-success-tips-comp": "../../component/order-submit-success-tips-comp/order-submit-success-tips-comp", |
| 64 | "empty-tips": "../../component/empty-tips/empty-tips", | ||
| 64 | "van-popup": "../../ui/vant-weapp/popup/index" | 65 | "van-popup": "../../ui/vant-weapp/popup/index" |
| 65 | } | 66 | } |
| 66 | } | 67 | } | ... | ... |
| ... | @@ -18,6 +18,10 @@ Component({ | ... | @@ -18,6 +18,10 @@ Component({ |
| 18 | innerButton: { | 18 | innerButton: { |
| 19 | type: String, | 19 | type: String, |
| 20 | value: '确定', | 20 | value: '确定', |
| 21 | }, | ||
| 22 | prizeInfo: { | ||
| 23 | type: Object, | ||
| 24 | value: {} | ||
| 21 | } | 25 | } |
| 22 | }, | 26 | }, |
| 23 | data: { | 27 | data: { |
| ... | @@ -33,12 +37,14 @@ Component({ | ... | @@ -33,12 +37,14 @@ Component({ |
| 33 | }, | 37 | }, |
| 34 | // 隐藏蒙层 | 38 | // 隐藏蒙层 |
| 35 | hideMask() { | 39 | hideMask() { |
| 40 | console.log("hideMask:",this.properties.prizeInfo); | ||
| 36 | this.triggerEvent('evtcomp', { | 41 | this.triggerEvent('evtcomp', { |
| 37 | name: "_evt_hide_mask" | 42 | name: "_evt_hide_mask" |
| 38 | }); | 43 | }); |
| 39 | }, | 44 | }, |
| 40 | // 点击自定义按钮 | 45 | // 点击自定义按钮 |
| 41 | onInnerButtonHandler() { | 46 | onInnerButtonHandler() { |
| 47 | console.log("onInnerButtonHandler:",this.properties.prizeInfo); | ||
| 42 | this.triggerEvent('evtcomp', { | 48 | this.triggerEvent('evtcomp', { |
| 43 | name: "_evt_common_comp_button", | 49 | name: "_evt_common_comp_button", |
| 44 | data: { | 50 | data: { |
| ... | @@ -49,5 +55,5 @@ Component({ | ... | @@ -49,5 +55,5 @@ Component({ |
| 49 | } | 55 | } |
| 50 | }); | 56 | }); |
| 51 | } | 57 | } |
| 52 | } | 58 | }, |
| 53 | }) | 59 | }) | ... | ... |
| 1 | <view class="comp-item"> | 1 | <view class="comp-item"> |
| 2 | <view class="cspace"></view> | 2 | <view class="cspace"></view> |
| 3 | <view class="cont"> | 3 | <view class="cont"> |
| 4 | <view class="tit tit3">恭喜获得88元现金红包</view> | 4 | <view class="tit tit3">恭喜获得{{prizeInfo.signPrizeName}}</view> |
| 5 | <!-- 红包 --> | 5 | <!-- 红包 --> |
| 6 | <block> | 6 | <block wx:if="{{prizeInfo.signPrizeType == 'packet'}}"> |
| 7 | <image class="prize" mode="aspectFit" src="../../image/prize/prize-red-package.png" /> | 7 | <image class="prize" mode="aspectFit" src="../../image/prize/prize-red-package.png" /> |
| 8 | <view></view> | 8 | <view></view> |
| 9 | <text class="tips">现金红包已经快马加鞭给您派送\n请注意通知消息,并在24小时内领取哦~</text> | 9 | <text class="tips">现金红包已经快马加鞭给您派送\n请注意通知消息,并在24小时内领取哦~</text> |
| 10 | </block> | 10 | </block> |
| 11 | <!-- 积分 --> | 11 | <!-- 积分 --> |
| 12 | <!-- <block> | 12 | <block wx:else> |
| 13 | <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" /> | 13 | <image class="prize" mode="aspectFit" src="../../image/prize/prize-integral.png" /> |
| 14 | <view ></view> | 14 | <view></view> |
| 15 | <text class="tips">积分已派送到您的账户\n可在“积分明细”里查看</text> | 15 | <text class="tips">积分已派送到您的账户\n可在“积分明细”里查看</text> |
| 16 | </block> --> | 16 | </block> |
| 17 | </view> | 17 | </view> |
| 18 | <button class="btn" bindtap="hideMask">我知道了</button> | 18 | <button class="btn" bindtap="hideMask">我知道了</button> |
| 19 | </view> | 19 | </view> | ... | ... |
| ... | @@ -36,7 +36,6 @@ | ... | @@ -36,7 +36,6 @@ |
| 36 | .image { | 36 | .image { |
| 37 | width: 172px; | 37 | width: 172px; |
| 38 | height: 172px; | 38 | height: 172px; |
| 39 | background-color: wheat; | ||
| 40 | } | 39 | } |
| 41 | } | 40 | } |
| 42 | 41 | ||
| ... | @@ -45,7 +44,7 @@ | ... | @@ -45,7 +44,7 @@ |
| 45 | } | 44 | } |
| 46 | 45 | ||
| 47 | .tips { | 46 | .tips { |
| 48 | margin-top: 20px; | 47 | margin-top: 24px; |
| 49 | color: #999999; | 48 | color: #999999; |
| 50 | font-size: 24px; | 49 | font-size: 24px; |
| 51 | } | 50 | } | ... | ... |
| ... | @@ -3,10 +3,11 @@ | ... | @@ -3,10 +3,11 @@ |
| 3 | <view class="cont"> | 3 | <view class="cont"> |
| 4 | <view class="tit">订单提交成功!</view> | 4 | <view class="tit">订单提交成功!</view> |
| 5 | <view class="prize"> | 5 | <view class="prize"> |
| 6 | <image class="image" mode="aspectFit" /> | 6 | <image class="image" mode="aspectFit" src="{{item.commodityThumbnail}}" /> |
| 7 | </view> | 7 | </view> |
| 8 | <view class="name">某东购物卡200元</view> | 8 | <view class="name">{{item.commodityTitle}}</view> |
| 9 | <button class="btn" bindtap="onInnerButtonHandler">{{innerButton}}</button> | 9 | <button class="btn" bindtap="onInnerButtonHandler">{{innerButton}}</button> |
| 10 | <view class="tips">您可以在“个人中心→我的订单”中查看物流进度</view> | 10 | <view wx:if="{{item.commodityType == 'packet'}}" class="tips">您可以在“个人中心→我的订单”中查看物流进度</view> |
| 11 | <view wx:else class="tips">后台审核通过后,红包将会通过公众号消息或微信服务消息发送,届时请及时领取!</view> | ||
| 11 | </view> | 12 | </view> |
| 12 | </view> | 13 | </view> | ... | ... |
| ... | @@ -19,7 +19,8 @@ module.exports = { | ... | @@ -19,7 +19,8 @@ module.exports = { |
| 19 | announcementList: '/announcement/list', // post 我的消息 我的消息列表 | 19 | announcementList: '/announcement/list', // post 我的消息 我的消息列表 |
| 20 | announcementUpdate: '/announcement/update', // post 我的消息标已读 用户注册接口 | 20 | announcementUpdate: '/announcement/update', // post 我的消息标已读 用户注册接口 |
| 21 | announcementDelete: '/announcement/delete', // post 我的消息删除 删除已读消息 | 21 | announcementDelete: '/announcement/delete', // post 我的消息删除 删除已读消息 |
| 22 | announcementDeleteOne: 'announcement/delete/one', // post 我的消息删除---单个 删除单条消息 单个的英文是single | 22 | announcementUpdateOne: '/announcement/update/one', // post 我的消息标已读 用户注册接口 |
| 23 | announcementDeleteOne: '/announcement/delete/one', // post 我的消息删除---单个 删除单条消息 单个的英文是single | ||
| 23 | messageSave: '/message/save', // post 用户留言 | 24 | messageSave: '/message/save', // post 用户留言 |
| 24 | contact: '/contact', // post 联系方式 | 25 | contact: '/contact', // post 联系方式 |
| 25 | order: '/order', // post 订单状态 订单列表 | 26 | order: '/order', // post 订单状态 订单列表 | ... | ... |
| ... | @@ -148,7 +148,7 @@ Page({ | ... | @@ -148,7 +148,7 @@ Page({ |
| 148 | 'content-type': 'multipart/form-data' | 148 | 'content-type': 'multipart/form-data' |
| 149 | }, | 149 | }, |
| 150 | formData: { | 150 | formData: { |
| 151 | path: '/weapp/zhiliang-light/' | 151 | path: '/weapp/zhiliang-light-upload/' |
| 152 | }, | 152 | }, |
| 153 | // HTTP 请求中其他额外的 form data | 153 | // HTTP 请求中其他额外的 form data |
| 154 | success(res) { | 154 | success(res) { | ... | ... |
| ... | @@ -6,7 +6,9 @@ let app = getApp(); | ... | @@ -6,7 +6,9 @@ let app = getApp(); |
| 6 | Page({ | 6 | Page({ |
| 7 | data: { | 7 | data: { |
| 8 | authorizeVisible: false, | 8 | authorizeVisible: false, |
| 9 | contactInfo: {} | 9 | contactInfo: {}, |
| 10 | // qrcodeUrl:"https://kd.cdn.xyiyang.com/weapp/zhiliang-light/qrcode/qrcode-focus.png", | ||
| 11 | qrcodeUrl: "https://kdcdn.oss-cn-shenzhen.aliyuncs.com/weapp/zhiliang-light/qrcode/qrcode-focus.png", | ||
| 10 | }, | 12 | }, |
| 11 | onShareAppMessage() {}, | 13 | onShareAppMessage() {}, |
| 12 | showAuth() { | 14 | showAuth() { |
| ... | @@ -33,6 +35,19 @@ Page({ | ... | @@ -33,6 +35,19 @@ Page({ |
| 33 | phoneNumber: phoneNumber | 35 | phoneNumber: phoneNumber |
| 34 | }) | 36 | }) |
| 35 | }, | 37 | }, |
| 38 | |||
| 39 | /** | ||
| 40 | * 图片查看 | ||
| 41 | */ | ||
| 42 | onPreviewImageHandler(evt) { | ||
| 43 | let current = this.data.qrcodeUrl; | ||
| 44 | let urls = [current]; | ||
| 45 | wx.previewImage({ | ||
| 46 | current: current, | ||
| 47 | urls: urls | ||
| 48 | }) | ||
| 49 | }, | ||
| 50 | |||
| 36 | // 联系我们 | 51 | // 联系我们 |
| 37 | queryContact() { | 52 | queryContact() { |
| 38 | return new Promise((resolve, reject) => { | 53 | return new Promise((resolve, reject) => { | ... | ... |
| ... | @@ -41,9 +41,9 @@ | ... | @@ -41,9 +41,9 @@ |
| 41 | </view> | 41 | </view> |
| 42 | <!-- 关注 --> | 42 | <!-- 关注 --> |
| 43 | <view class="border focus"> | 43 | <view class="border focus"> |
| 44 | <image class="qrcode" mode="widthFix" src="../../image/qrcode/qrcode-focus.png" /> | 44 | <image bindtap="onPreviewImageHandler" class="qrcode" mode="widthFix" src="{{qrcodeUrl}}" /> |
| 45 | <view class="tips">更多讯息,欢迎关注我们的公众号</view> | 45 | <view class="tips">更多讯息,欢迎关注我们的公众号</view> |
| 46 | <view class="btn">一键关注</view> | 46 | <view bindtap="onPreviewImageHandler" class="btn">一键关注</view> |
| 47 | </view> | 47 | </view> |
| 48 | </view> | 48 | </view> |
| 49 | </view> | 49 | </view> | ... | ... |
| ... | @@ -8,7 +8,7 @@ Page({ | ... | @@ -8,7 +8,7 @@ Page({ |
| 8 | data: { | 8 | data: { |
| 9 | authorizeVisible: false, | 9 | authorizeVisible: false, |
| 10 | commonTipsCompVisible: false, | 10 | commonTipsCompVisible: false, |
| 11 | orderSubmitSuccessCompVisible: true, | 11 | orderSubmitSuccessCompVisible: false, |
| 12 | cid: "1", // 1积分不足 2.账号未审核 | 12 | cid: "1", // 1积分不足 2.账号未审核 |
| 13 | innerTitle: "", | 13 | innerTitle: "", |
| 14 | innerText: "", | 14 | innerText: "", |
| ... | @@ -32,6 +32,7 @@ Page({ | ... | @@ -32,6 +32,7 @@ Page({ |
| 32 | this.initData(); | 32 | this.initData(); |
| 33 | }, | 33 | }, |
| 34 | initData() { | 34 | initData() { |
| 35 | return new Promise((resolve, reject) => { | ||
| 35 | app.queryIndex().then((result) => { | 36 | app.queryIndex().then((result) => { |
| 36 | app.post({ | 37 | app.post({ |
| 37 | url: app.api.receiver, | 38 | url: app.api.receiver, |
| ... | @@ -44,8 +45,11 @@ Page({ | ... | @@ -44,8 +45,11 @@ Page({ |
| 44 | defaultReceiver: defaultReceiver, | 45 | defaultReceiver: defaultReceiver, |
| 45 | item: app.globalData.giftInfo, | 46 | item: app.globalData.giftInfo, |
| 46 | }) | 47 | }) |
| 48 | resolve(); | ||
| 47 | }) | 49 | }) |
| 48 | }) | 50 | }) |
| 51 | }); | ||
| 52 | |||
| 49 | }, | 53 | }, |
| 50 | 54 | ||
| 51 | showTips(tips) { | 55 | showTips(tips) { |
| ... | @@ -125,6 +129,12 @@ Page({ | ... | @@ -125,6 +129,12 @@ Page({ |
| 125 | remark: this.data.remark | 129 | remark: this.data.remark |
| 126 | } | 130 | } |
| 127 | }).then((result) => { | 131 | }).then((result) => { |
| 132 | _this.initData().then((result) => { | ||
| 133 | _this.setData({ | ||
| 134 | orderSubmitSuccessCompVisible: true | ||
| 135 | }) | ||
| 136 | }) | ||
| 137 | |||
| 128 | 138 | ||
| 129 | }) | 139 | }) |
| 130 | } | 140 | } | ... | ... |
| ... | @@ -7,7 +7,7 @@ | ... | @@ -7,7 +7,7 @@ |
| 7 | <view class="product"> | 7 | <view class="product"> |
| 8 | <view class="product-item"> | 8 | <view class="product-item"> |
| 9 | <view class="image-wrap"> | 9 | <view class="image-wrap"> |
| 10 | <image class="image" mode="aspectFit" src="{{item.commodityImages[0]}}" /> | 10 | <image class="image" mode="aspectFit" src="{{item.commodityThumbnail}}" /> |
| 11 | </view> | 11 | </view> |
| 12 | <view class="cont"> | 12 | <view class="cont"> |
| 13 | <view class="name">{{item.commodityTitle || '-'}}</view> | 13 | <view class="name">{{item.commodityTitle || '-'}}</view> | ... | ... |
| ... | @@ -6,7 +6,6 @@ let app = getApp(); | ... | @@ -6,7 +6,6 @@ let app = getApp(); |
| 6 | Page({ | 6 | Page({ |
| 7 | data: { | 7 | data: { |
| 8 | authorizeVisible: false, | 8 | authorizeVisible: false, |
| 9 | orderSubmitSuccessTipsCompVisible: false, | ||
| 10 | total: 0, | 9 | total: 0, |
| 11 | page: 1, | 10 | page: 1, |
| 12 | size: 10, | 11 | size: 10, |
| ... | @@ -114,7 +113,6 @@ Page({ | ... | @@ -114,7 +113,6 @@ Page({ |
| 114 | hideMask() { | 113 | hideMask() { |
| 115 | this.setData({ | 114 | this.setData({ |
| 116 | authorizeVisible: false, | 115 | authorizeVisible: false, |
| 117 | orderSubmitSuccessTipsCompVisible: false, | ||
| 118 | }) | 116 | }) |
| 119 | }, | 117 | }, |
| 120 | // 子组件事件 | 118 | // 子组件事件 | ... | ... |
| ... | @@ -26,7 +26,7 @@ | ... | @@ -26,7 +26,7 @@ |
| 26 | <view class="product"> | 26 | <view class="product"> |
| 27 | <view class="product-item" wx:for="{{productList}}" wx:key="{{index}}"> | 27 | <view class="product-item" wx:for="{{productList}}" wx:key="{{index}}"> |
| 28 | <view class="image-wrap"> | 28 | <view class="image-wrap"> |
| 29 | <image class="image" mode="aspectFit" src="{{item.commodityImages[0]}}" /> | 29 | <image class="image" mode="aspectFit" src="{{item.commodityThumbnail}}" /> |
| 30 | </view> | 30 | </view> |
| 31 | <view class="cont"> | 31 | <view class="cont"> |
| 32 | <view class="name">{{item.commodityTitle}}</view> | 32 | <view class="name">{{item.commodityTitle}}</view> |
| ... | @@ -42,6 +42,3 @@ | ... | @@ -42,6 +42,3 @@ |
| 42 | <van-popup show="{{ authorizeVisible }}"> | 42 | <van-popup show="{{ authorizeVisible }}"> |
| 43 | <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> | 43 | <authorize-comp bind:evtcomp="evtcomp"></authorize-comp> |
| 44 | </van-popup> | 44 | </van-popup> |
| 45 | <van-popup show="{{ orderSubmitSuccessTipsCompVisible }}"> | ||
| 46 | <order-submit-success-tips-comp bind:evtcomp="evtcomp" inner-title="积分不足" inner-text="使用推广、签到功能\n可获取更多积分!" inner-button="我知道了"></order-submit-success-tips-comp> | ||
| 47 | </van-popup> | ... | ... |
| 1 | import { | ||
| 2 | getBindtapData | ||
| 3 | } from '../../utils/util'; | ||
| 4 | |||
| 1 | let app = getApp(); | 5 | let app = getApp(); |
| 2 | Page({ | 6 | Page({ |
| 3 | data: { | 7 | data: { |
| 4 | authorizeVisible: false, | 8 | authorizeVisible: false, |
| 9 | total: 0, | ||
| 10 | page: 1, | ||
| 11 | size: 10, | ||
| 12 | dataList: [], | ||
| 5 | }, | 13 | }, |
| 6 | onShareAppMessage() {}, | 14 | onShareAppMessage() {}, |
| 7 | showAuth() { | 15 | showAuth() { |
| ... | @@ -9,5 +17,136 @@ Page({ | ... | @@ -9,5 +17,136 @@ Page({ |
| 9 | authorizeVisible: true | 17 | authorizeVisible: true |
| 10 | }) | 18 | }) |
| 11 | }, | 19 | }, |
| 12 | onLoad(options) {} | 20 | onLoad(options) { |
| 21 | this.initData(); | ||
| 22 | }, | ||
| 23 | initData() { | ||
| 24 | this.queryAnnouncementList(); | ||
| 25 | }, | ||
| 26 | // 到达底部 | ||
| 27 | onReachBottom() { | ||
| 28 | if (this.data.dataList.length < this.data.total) { | ||
| 29 | this.setData({ | ||
| 30 | page: this.data.page + 1 | ||
| 31 | }); | ||
| 32 | this.queryAnnouncementList(); | ||
| 33 | } | ||
| 34 | }, | ||
| 35 | // 重置页面列表 点击搜索条件时需要 | ||
| 36 | resetPage() { | ||
| 37 | this.setData({ | ||
| 38 | page: 1, | ||
| 39 | dataList: [] | ||
| 40 | }) | ||
| 41 | }, | ||
| 42 | // 请求列表 | ||
| 43 | queryAnnouncementList() { | ||
| 44 | return new Promise((resolve, reject) => { | ||
| 45 | app.post({ | ||
| 46 | url: app.api.announcementList, | ||
| 47 | data: { | ||
| 48 | page: this.data.page, | ||
| 49 | size: this.data.size, | ||
| 50 | } | ||
| 51 | }).then((result) => { | ||
| 52 | let dataList = result.announcementItems; | ||
| 53 | dataList = this.data.dataList.concat(dataList); | ||
| 54 | this.setData({ | ||
| 55 | dataList: dataList, | ||
| 56 | total: result.total | ||
| 57 | }) | ||
| 58 | resolve(); | ||
| 59 | }) | ||
| 60 | }); | ||
| 61 | }, | ||
| 62 | |||
| 63 | /** | ||
| 64 | * 标记已读 | ||
| 65 | * @param {*} evt | ||
| 66 | */ | ||
| 67 | tagReadItem(evt) { | ||
| 68 | let curData = getBindtapData(evt); | ||
| 69 | let curIndex = getBindtapData(evt, "index"); | ||
| 70 | let announcementCode = curData.announcementCode || ""; | ||
| 71 | let dataList = this.data.dataList; | ||
| 72 | app.post({ | ||
| 73 | url: app.api.announcementUpdateOne, | ||
| 74 | data: { | ||
| 75 | announcementCode: announcementCode | ||
| 76 | } | ||
| 77 | }).then((result) => { | ||
| 78 | dataList[curIndex].read = 1; | ||
| 79 | this.setData({ | ||
| 80 | dataList: dataList | ||
| 81 | }) | ||
| 82 | wx.showToast({ | ||
| 83 | title: "操作成功" | ||
| 84 | }) | ||
| 85 | }); | ||
| 86 | }, | ||
| 87 | |||
| 88 | /** | ||
| 89 | * 删除已读 | ||
| 90 | * @param {*} evt | ||
| 91 | */ | ||
| 92 | deleteItem(evt) { | ||
| 93 | let curData = getBindtapData(evt); | ||
| 94 | let curIndex = getBindtapData(evt, "index"); | ||
| 95 | let announcementCode = curData.announcementCode || ""; | ||
| 96 | let dataList = this.data.dataList; | ||
| 97 | console.log("data"); | ||
| 98 | app.post({ | ||
| 99 | url: app.api.announcementDeleteOne, | ||
| 100 | data: { | ||
| 101 | announcementCode: announcementCode | ||
| 102 | } | ||
| 103 | }).then((result) => { | ||
| 104 | dataList.splice(curIndex, 1); | ||
| 105 | this.setData({ | ||
| 106 | dataList: dataList | ||
| 107 | }) | ||
| 108 | wx.showToast({ | ||
| 109 | title: "操作成功" | ||
| 110 | }) | ||
| 111 | }); | ||
| 112 | }, | ||
| 113 | |||
| 114 | /** | ||
| 115 | * 标记所有已读 | ||
| 116 | * @param {*} evt | ||
| 117 | */ | ||
| 118 | tagReadAll(evt) { | ||
| 119 | let dataList = this.data.dataList; | ||
| 120 | app.post({ | ||
| 121 | url: app.api.announcementUpdate, | ||
| 122 | data: {} | ||
| 123 | }).then((result) => { | ||
| 124 | dataList.forEach(element => { | ||
| 125 | element.read = 1; | ||
| 126 | }); | ||
| 127 | this.setData({ | ||
| 128 | dataList: dataList | ||
| 129 | }) | ||
| 130 | wx.showToast({ | ||
| 131 | title: "操作成功" | ||
| 132 | }) | ||
| 133 | }); | ||
| 134 | }, | ||
| 135 | |||
| 136 | /** | ||
| 137 | * 删除所有已读 | ||
| 138 | */ | ||
| 139 | deleteAll() { | ||
| 140 | app.post({ | ||
| 141 | url: app.api.announcementDelete, | ||
| 142 | data: {} | ||
| 143 | }).then((result) => { | ||
| 144 | this.queryAnnouncementList().then((result) => { | ||
| 145 | this.resetPage(); | ||
| 146 | wx.showToast({ | ||
| 147 | title: "操作成功" | ||
| 148 | }) | ||
| 149 | }) | ||
| 150 | }); | ||
| 151 | } | ||
| 13 | }) | 152 | }) | ... | ... |
| ... | @@ -5,21 +5,28 @@ | ... | @@ -5,21 +5,28 @@ |
| 5 | <view class="top-space"></view> | 5 | <view class="top-space"></view> |
| 6 | <view class="content"> | 6 | <view class="content"> |
| 7 | <view class="func"> | 7 | <view class="func"> |
| 8 | <view class="func-item ">全部标为已读</view> | 8 | <view bindtap="tagReadAll" class="func-item">全部标为已读</view> |
| 9 | <view class="func-item func-item2">删除已读消息</view> | 9 | <view bindtap="deleteAll" class="func-item func-item2">删除已读消息</view> |
| 10 | </view> | 10 | </view> |
| 11 | <view class="news"> | 11 | <view class="news"> |
| 12 | <view class="border news-item"> | 12 | <view wx:for="{{dataList}}" wx:key="{{index}}" class="border news-item"> |
| 13 | <view class="tit"> | 13 | <view class="tit"> |
| 14 | <view class="tit-item">订单消息</view> | 14 | <view class="tit-item">{{item.announcementTitle}}</view> |
| 15 | <view class="tit-item"> | 15 | <view class="tit-item"> |
| 16 | <span class="t1">标记已读</span> | 16 | <span bindtap="tagReadItem" data-data="{{item}}" data-index="{{index}}" wx:if="{{item.read == 0}}" class="t1"> |
| 17 | 标记已读 | ||
| 18 | </span> | ||
| 19 | <span bindtap="deleteItem" data-data="{{item}}" data-index="{{index}}" wx:if="{{item.read == 1}}" class="t2"> | ||
| 20 | 删除 | ||
| 21 | </span> | ||
| 17 | </view> | 22 | </view> |
| 18 | </view> | 23 | </view> |
| 19 | <view class="desc">您的订单 2357123413491 已通过审核!</view> | 24 | <view class="desc">{{item.announcementContent}}</view> |
| 20 | </view> | 25 | </view> |
| 26 | <!-- 11wx:if="{{dataList.length <= 0}}" --> | ||
| 21 | </view> | 27 | </view> |
| 22 | </view> | 28 | </view> |
| 29 | <empty-tips wx:if="{{dataList.length <= 0}}"></empty-tips> | ||
| 23 | </view> | 30 | </view> |
| 24 | </view> | 31 | </view> |
| 25 | <van-popup show="{{ authorizeVisible }}"> | 32 | <van-popup show="{{ authorizeVisible }}"> | ... | ... |
| ... | @@ -6,7 +6,11 @@ let app = getApp(); | ... | @@ -6,7 +6,11 @@ let app = getApp(); |
| 6 | Page({ | 6 | Page({ |
| 7 | data: { | 7 | data: { |
| 8 | authorizeVisible: false, | 8 | authorizeVisible: false, |
| 9 | navIndex: 0 | 9 | navIndex: 0, |
| 10 | total: 0, | ||
| 11 | page: 1, | ||
| 12 | size: 10, | ||
| 13 | dataList: [], | ||
| 10 | }, | 14 | }, |
| 11 | onShareAppMessage() {}, | 15 | onShareAppMessage() {}, |
| 12 | showAuth() { | 16 | showAuth() { |
| ... | @@ -18,13 +22,52 @@ Page({ | ... | @@ -18,13 +22,52 @@ Page({ |
| 18 | let { | 22 | let { |
| 19 | navIndex | 23 | navIndex |
| 20 | } = options; | 24 | } = options; |
| 21 | console.log("navIndex:", navIndex); | ||
| 22 | if (navIndex) { | 25 | if (navIndex) { |
| 23 | this.setData({ | 26 | this.setData({ |
| 24 | navIndex: navIndex | 27 | navIndex: navIndex |
| 25 | }) | 28 | }) |
| 26 | } | 29 | } |
| 30 | this.initData(); | ||
| 27 | }, | 31 | }, |
| 32 | |||
| 33 | initData() { | ||
| 34 | this.queryOrder(); | ||
| 35 | }, | ||
| 36 | |||
| 37 | // 到达底部 | ||
| 38 | onReachBottom() { | ||
| 39 | if (this.data.dataList.length < this.data.total) { | ||
| 40 | this.setData({ | ||
| 41 | page: this.data.page + 1 | ||
| 42 | }); | ||
| 43 | this.queryOrder(); | ||
| 44 | } | ||
| 45 | }, | ||
| 46 | |||
| 47 | /** | ||
| 48 | * 订单状态 | ||
| 49 | */ | ||
| 50 | queryOrder() { | ||
| 51 | return new Promise((resolve, reject) => { | ||
| 52 | app.post({ | ||
| 53 | url: app.api.order, | ||
| 54 | data: { | ||
| 55 | page: this.data.page, | ||
| 56 | size: this.data.size, | ||
| 57 | orderStatus: "" | ||
| 58 | } | ||
| 59 | }).then((result) => { | ||
| 60 | let dataList = result.list; | ||
| 61 | dataList = this.data.dataList.concat(dataList); | ||
| 62 | this.setData({ | ||
| 63 | dataList: dataList, | ||
| 64 | total: result.total | ||
| 65 | }) | ||
| 66 | resolve(); | ||
| 67 | }) | ||
| 68 | }); | ||
| 69 | }, | ||
| 70 | |||
| 28 | /** | 71 | /** |
| 29 | * 选择导航 | 72 | * 选择导航 |
| 30 | * @param {*} evt | 73 | * @param {*} evt | ... | ... |
| ... | @@ -28,68 +28,9 @@ | ... | @@ -28,68 +28,9 @@ |
| 28 | </view> | 28 | </view> |
| 29 | </view> | 29 | </view> |
| 30 | <!-- 卡片 --> | 30 | <!-- 卡片 --> |
| 31 | <view class="card"> | ||
| 32 | <view class="border card-item"> | ||
| 33 | <view class="no">订单编号:2357123413491</view> | ||
| 34 | <view class="line"></view> | ||
| 35 | <view class="cont"> | ||
| 36 | <view class="prize"> | ||
| 37 | <image class="image" mode="aspectFit" /> | ||
| 38 | </view> | ||
| 39 | <view class="detail"> | ||
| 40 | <view class="t1">某东购物卡200元</view> | ||
| 41 | <view class="t1 t2">消耗积分:1000分</view> | ||
| 42 | <view class="t1 t3">处理中</view> | ||
| 43 | </view> | ||
| 44 | </view> | ||
| 45 | <view class="line"></view> | ||
| 46 | <view class="logistics"> | ||
| 47 | <view class="logistics-item"> | ||
| 48 | <view class="label">收货地址</view> | ||
| 49 | <view class="val">深圳市龙岗区XXX路</view> | ||
| 50 | </view> | ||
| 51 | <view class="logistics-item"> | ||
| 52 | <view class="label">物流公司</view> | ||
| 53 | <view class="val">待定</view> | ||
| 54 | </view> | ||
| 55 | <view class="logistics-item"> | ||
| 56 | <view class="label">物流单号</view> | ||
| 57 | <view class="val">暂定</view> | ||
| 58 | </view> | ||
| 59 | </view> | ||
| 60 | </view> | ||
| 61 | 31 | ||
| 62 | <view class="border card-item"> | ||
| 63 | <view class="no">订单编号:2357123413491</view> | ||
| 64 | <view class="line"></view> | ||
| 65 | <view class="cont"> | ||
| 66 | <view class="prize"> | ||
| 67 | <image class="image" mode="aspectFit" /> | ||
| 68 | </view> | ||
| 69 | <view class="detail"> | ||
| 70 | <view class="t1">某东购物卡200元</view> | ||
| 71 | <view class="t1 t2">消耗积分:1000分</view> | ||
| 72 | <view class="t1 t3">处理中</view> | ||
| 73 | </view> | ||
| 74 | </view> | ||
| 75 | <view class="line"></view> | ||
| 76 | <view class="logistics"> | ||
| 77 | <view class="logistics-item"> | ||
| 78 | <view class="label">收货地址</view> | ||
| 79 | <view class="val">深圳市龙岗区XXX路</view> | ||
| 80 | </view> | ||
| 81 | <view class="logistics-item"> | ||
| 82 | <view class="label">物流公司</view> | ||
| 83 | <view class="val">待定</view> | ||
| 84 | </view> | ||
| 85 | <view class="logistics-item"> | ||
| 86 | <view class="label">物流单号</view> | ||
| 87 | <view class="val">暂定</view> | ||
| 88 | </view> | ||
| 89 | </view> | ||
| 90 | </view> | ||
| 91 | </view> | ||
| 92 | </view> | 32 | </view> |
| 33 | <empty-tips wx:if="{{dataList.length <= 0}}"></empty-tips> | ||
| 93 | </view> | 34 | </view> |
| 94 | </view> | 35 | </view> |
| 95 | <van-popup show="{{ authorizeVisible }}"> | 36 | <van-popup show="{{ authorizeVisible }}"> | ... | ... |
| ... | @@ -15,6 +15,7 @@ Page({ | ... | @@ -15,6 +15,7 @@ Page({ |
| 15 | userInfo: {}, // 用户数据 | 15 | userInfo: {}, // 用户数据 |
| 16 | signInfo: [], // 签到数据 | 16 | signInfo: [], // 签到数据 |
| 17 | signNum: 0, // 签到天数 | 17 | signNum: 0, // 签到天数 |
| 18 | signPrize: {}, //签到奖励 | ||
| 18 | }, | 19 | }, |
| 19 | onShareAppMessage() {}, | 20 | onShareAppMessage() {}, |
| 20 | showAuth() { | 21 | showAuth() { |
| ... | @@ -23,10 +24,10 @@ Page({ | ... | @@ -23,10 +24,10 @@ Page({ |
| 23 | }) | 24 | }) |
| 24 | }, | 25 | }, |
| 25 | onShow() { | 26 | onShow() { |
| 26 | 27 | this.initData(); | |
| 27 | }, | 28 | }, |
| 28 | onLoad(options) { | 29 | onLoad(options) { |
| 29 | this.initData(); | 30 | |
| 30 | }, | 31 | }, |
| 31 | initData() { | 32 | initData() { |
| 32 | this.queryMember().then((result) => { | 33 | this.queryMember().then((result) => { |
| ... | @@ -43,13 +44,12 @@ Page({ | ... | @@ -43,13 +44,12 @@ Page({ |
| 43 | app.post({ | 44 | app.post({ |
| 44 | toast: false, | 45 | toast: false, |
| 45 | url: app.api.sign, | 46 | url: app.api.sign, |
| 46 | |||
| 47 | }).then((result) => { | 47 | }).then((result) => { |
| 48 | this.querySignInfo().then((result2) => { | 48 | this.querySignInfo().then((result2) => { |
| 49 | wx.showModal({ | 49 | // 签到成功 |
| 50 | content: '签到成功', | 50 | this.setData({ |
| 51 | showCancel: false, | 51 | signPrize: result2, |
| 52 | success(res) {} | 52 | giftSignTipsCompVisible: true |
| 53 | }) | 53 | }) |
| 54 | }) | 54 | }) |
| 55 | }).catch((err) => { | 55 | }).catch((err) => { |
| ... | @@ -189,12 +189,21 @@ Page({ | ... | @@ -189,12 +189,21 @@ Page({ |
| 189 | /** | 189 | /** |
| 190 | * 去验证 | 190 | * 去验证 |
| 191 | */ | 191 | */ |
| 192 | toVipLogin() { | 192 | toVipLoginHandler() { |
| 193 | app.router.push({ | 193 | app.router.push({ |
| 194 | path: "vipLogin" | 194 | path: "vipLogin" |
| 195 | }) | 195 | }) |
| 196 | }, | 196 | }, |
| 197 | 197 | ||
| 198 | /** | ||
| 199 | * 查看审核 | ||
| 200 | */ | ||
| 201 | toVipVerifyHandler() { | ||
| 202 | app.router.push({ | ||
| 203 | path: "vipVerify" | ||
| 204 | }) | ||
| 205 | }, | ||
| 206 | |||
| 198 | // 隐藏蒙层 | 207 | // 隐藏蒙层 |
| 199 | hideMask() { | 208 | hideMask() { |
| 200 | this.setData({ | 209 | this.setData({ | ... | ... |
| ... | @@ -14,7 +14,10 @@ | ... | @@ -14,7 +14,10 @@ |
| 14 | <view wx:if="{{userInfo.auditStatus == 'authorization'}}" class="vip vip-check"> | 14 | <view wx:if="{{userInfo.auditStatus == 'authorization'}}" class="vip vip-check"> |
| 15 | 积分会员 | 15 | 积分会员 |
| 16 | </view> | 16 | </view> |
| 17 | <view wx:else class="vip" bindtap="toVipLogin">未验证 ></view> | 17 | <view wx:elif="{{userInfo.auditStatus == 'unauthorized'}}" class="vip" bindtap="toVipVerifyHandler"> |
| 18 | 审核中 > | ||
| 19 | </view> | ||
| 20 | <view wx:else class="vip" bindtap="toVipLoginHandler">未验证 ></view> | ||
| 18 | </view> | 21 | </view> |
| 19 | </view> | 22 | </view> |
| 20 | <!-- 右边栏 --> | 23 | <!-- 右边栏 --> |
| ... | @@ -46,11 +49,11 @@ | ... | @@ -46,11 +49,11 @@ |
| 46 | </view> | 49 | </view> |
| 47 | <!-- 7天签到 --> | 50 | <!-- 7天签到 --> |
| 48 | <view class="check"> | 51 | <view class="check"> |
| 49 | <view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item"> | 52 | <view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item {{item ? 'check-item-act' :''}}"> |
| 50 | <view class="no">{{index+1}}</view> | 53 | <view class="no">{{index+1}}</view> |
| 51 | <view class="icon"> | 54 | <view class="icon"> |
| 52 | <image wx:if="{{item}}" mode="aspectFit" src="../../image/icon/icon-check.png" /> | 55 | <image wx:if="{{item}}" mode="aspectFit" src="../../image/icon/icon-check.png" /> |
| 53 | <image wx:elif="{{index == signInfo.length -1}}" mode="aspectFit" src="../../image/icon/icon-red-package.png" /> | 56 | <image wx:elif="{{index == signInfo.length-1}}" mode="aspectFit" src="../../image/icon/icon-red-package.png" /> |
| 54 | <image wx:else mode="aspectFit" src="../../image/icon/icon-integral.png" /> | 57 | <image wx:else mode="aspectFit" src="../../image/icon/icon-integral.png" /> |
| 55 | </view> | 58 | </view> |
| 56 | </view> | 59 | </view> |
| ... | @@ -140,5 +143,5 @@ | ... | @@ -140,5 +143,5 @@ |
| 140 | <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp> | 143 | <sign-tips-comp bind:evtcomp="evtcomp"></sign-tips-comp> |
| 141 | </van-popup> | 144 | </van-popup> |
| 142 | <van-popup show="{{ giftSignTipsCompVisible }}"> | 145 | <van-popup show="{{ giftSignTipsCompVisible }}"> |
| 143 | <gift-sign-tips-comp bind:evtcomp="evtcomp"></gift-sign-tips-comp> | 146 | <gift-sign-tips-comp bind:evtcomp="evtcomp" prize-info="{{signPrize}}"></gift-sign-tips-comp> |
| 144 | </van-popup> | 147 | </van-popup> | ... | ... |
| 1 | let Date = require('../../utils/date.js'); | 1 | let Date = require('../../utils/date.js'); |
| 2 | let Utils = require('../../utils/util.js'); | 2 | let Utils = require('../../utils/util.js'); |
| 3 | 3 | ||
| 4 | // import {getObjByListKeyValue} from '..'; | ||
| 5 | |||
| 4 | let app = getApp(); | 6 | let app = getApp(); |
| 5 | Page({ | 7 | Page({ |
| 6 | data: { | 8 | data: { |
| ... | @@ -13,33 +15,17 @@ Page({ | ... | @@ -13,33 +15,17 @@ Page({ |
| 13 | auth_time: 0, | 15 | auth_time: 0, |
| 14 | sendAuthCode: true, | 16 | sendAuthCode: true, |
| 15 | membersShipIndex: 0, | 17 | membersShipIndex: 0, |
| 16 | membersShipList: [{ | 18 | membersShipList: [], |
| 17 | value: "", | ||
| 18 | label: "请选择", | ||
| 19 | }, | ||
| 20 | { | ||
| 21 | value: "总代理", | ||
| 22 | label: "总代理", | ||
| 23 | }, | ||
| 24 | { | ||
| 25 | value: "经销商", | ||
| 26 | label: "经销商", | ||
| 27 | }, | ||
| 28 | { | ||
| 29 | value: "专业电工", | ||
| 30 | label: "专业电工", | ||
| 31 | }, | ||
| 32 | { | ||
| 33 | value: "其他用户", | ||
| 34 | label: "其他用户", | ||
| 35 | } | ||
| 36 | ], | ||
| 37 | maxImg: 1, // 上传数量 | 19 | maxImg: 1, // 上传数量 |
| 38 | files: [], // 上传文件列表 | 20 | files: [], // 上传文件列表 |
| 39 | provinceId: "", | 21 | provinceId: "", |
| 40 | cityId: "", | 22 | cityId: "", |
| 41 | provinceList: [], | 23 | provinceList: [], |
| 42 | cityList: [], | 24 | cityList: [], |
| 25 | province: "", | ||
| 26 | city: "", | ||
| 27 | memberTypeName: "", // label | ||
| 28 | memberTypeCode: "", // 码 | ||
| 43 | // form end | 29 | // form end |
| 44 | }, | 30 | }, |
| 45 | onShareAppMessage() {}, | 31 | onShareAppMessage() {}, |
| ... | @@ -53,13 +39,50 @@ Page({ | ... | @@ -53,13 +39,50 @@ Page({ |
| 53 | }, | 39 | }, |
| 54 | initData() { | 40 | initData() { |
| 55 | this.getProvince(); | 41 | this.getProvince(); |
| 42 | this.getMemberType().then((result) => { | ||
| 43 | app.post({ | ||
| 44 | url: app.api.memberIdQuery, | ||
| 45 | data: {}, | ||
| 46 | }).then((result) => { | ||
| 47 | let verifyInfo = result; | ||
| 48 | this.setData({ | ||
| 49 | name: verifyInfo.realName, | ||
| 50 | mobile: verifyInfo.phone, | ||
| 51 | province: verifyInfo.province, | ||
| 52 | city: verifyInfo.city, | ||
| 53 | memberTypeCode: verifyInfo.memberTypeCode, | ||
| 54 | memberTypeName: verifyInfo.memberTypeName, | ||
| 55 | files: [{ | ||
| 56 | path: verifyInfo.images | ||
| 57 | }] | ||
| 58 | }) | ||
| 59 | }) | ||
| 60 | }) | ||
| 56 | }, | 61 | }, |
| 57 | 62 | ||
| 63 | |||
| 58 | /** | 64 | /** |
| 59 | * 会员身份 | 65 | * 获取用户类型 |
| 60 | */ | 66 | */ |
| 61 | onSelectMembersShipHandler() { | 67 | getMemberType() { |
| 62 | 68 | return new Promise((resolve, reject) => { | |
| 69 | app.post({ | ||
| 70 | url: app.api.memberType, | ||
| 71 | data: {} | ||
| 72 | }).then((result) => { | ||
| 73 | let membersShipList = result; | ||
| 74 | // membersShipList.forEach(element => { | ||
| 75 | // element.label = element.memberTypeName | ||
| 76 | // }); | ||
| 77 | membersShipList.unshift({ | ||
| 78 | memberTypeName: "请选择" | ||
| 79 | }) | ||
| 80 | this.setData({ | ||
| 81 | membersShipList | ||
| 82 | }) | ||
| 83 | resolve(); | ||
| 84 | }) | ||
| 85 | }); | ||
| 63 | }, | 86 | }, |
| 64 | 87 | ||
| 65 | getProvince() { | 88 | getProvince() { |
| ... | @@ -96,23 +119,72 @@ Page({ | ... | @@ -96,23 +119,72 @@ Page({ |
| 96 | }); | 119 | }); |
| 97 | }, | 120 | }, |
| 98 | 121 | ||
| 99 | bindPickerChangeProvince(e) { | 122 | |
| 100 | let index = e.detail.value; | 123 | |
| 101 | this.setData({ | 124 | // 显示提示 |
| 102 | provinceIndex: index, | 125 | showTips(tips) { |
| 103 | provinceId: this.data.provinceList[index].areaId, | 126 | wx.showToast({ |
| 104 | cityList: [], | 127 | title: tips, |
| 105 | cityIndex: -1, | 128 | icon: "none" |
| 106 | }) | 129 | }) |
| 107 | this.getCity(); | ||
| 108 | }, | 130 | }, |
| 109 | 131 | ||
| 110 | bindPickerChangeCity(e) { | 132 | /** |
| 111 | let index = e.detail.value; | 133 | * 表单提交验证 |
| 112 | this.setData({ | 134 | */ |
| 113 | cityIndex: index, | 135 | checkSubmit() { |
| 114 | cityId: this.data.cityList[index].areaId, | 136 | return new Promise((resolve, reject) => { |
| 115 | }) | 137 | let { |
| 138 | name, | ||
| 139 | // membersShipIndex, | ||
| 140 | // membersShipList, | ||
| 141 | // provinceList, | ||
| 142 | // provinceIndex, | ||
| 143 | // cityList, | ||
| 144 | // cityIndex, | ||
| 145 | memberTypeCode, | ||
| 146 | province, | ||
| 147 | city, | ||
| 148 | mobile, | ||
| 149 | verifyCode, | ||
| 150 | files | ||
| 151 | } = this.data; | ||
| 152 | // let memberTypeCode = membersShipList[membersShipIndex].memberTypeCode; | ||
| 153 | // let province = provinceList[provinceIndex] && provinceList[provinceIndex].areaName || ""; | ||
| 154 | // let city = cityList[cityIndex] && cityList[cityIndex].areaName || ""; | ||
| 155 | let pics = []; | ||
| 156 | files.forEach(element => { | ||
| 157 | pics.push(element.path) | ||
| 158 | }); | ||
| 159 | |||
| 160 | if (!name) { | ||
| 161 | this.showTips("请输入真实姓名"); | ||
| 162 | reject(); | ||
| 163 | } else if (!memberTypeCode) { | ||
| 164 | this.showTips("请选择会员身份"); | ||
| 165 | reject(); | ||
| 166 | } else if (!province) { | ||
| 167 | this.showTips("请选择省"); | ||
| 168 | reject(); | ||
| 169 | } else if (!city) { | ||
| 170 | this.showTips("请选择市"); | ||
| 171 | reject(); | ||
| 172 | } else if (!mobile) { | ||
| 173 | this.showTips("请输入手机号码"); | ||
| 174 | reject(); | ||
| 175 | } else if (!Utils.checkMobile(mobile)) { | ||
| 176 | this.showTips("请输入正确手机号码"); | ||
| 177 | reject(); | ||
| 178 | } else if (!verifyCode) { | ||
| 179 | this.showTips("请输入验证码"); | ||
| 180 | reject(); | ||
| 181 | } else if (pics.length <= 0) { | ||
| 182 | this.showTips("请上传身份证或电工证"); | ||
| 183 | reject(); | ||
| 184 | } else { | ||
| 185 | resolve(); | ||
| 186 | } | ||
| 187 | }); | ||
| 116 | }, | 188 | }, |
| 117 | 189 | ||
| 118 | /** | 190 | /** |
| ... | @@ -123,15 +195,52 @@ Page({ | ... | @@ -123,15 +195,52 @@ Page({ |
| 123 | onSubmitHandler() { | 195 | onSubmitHandler() { |
| 124 | let { | 196 | let { |
| 125 | name, | 197 | name, |
| 126 | phone, | 198 | // membersShipIndex, |
| 199 | // membersShipList, | ||
| 200 | // provinceList, | ||
| 201 | // provinceIndex, | ||
| 202 | // cityList, | ||
| 203 | // cityIndex, | ||
| 204 | memberTypeCode, | ||
| 205 | province, | ||
| 206 | city, | ||
| 207 | mobile, | ||
| 127 | verifyCode, | 208 | verifyCode, |
| 128 | files | 209 | files |
| 129 | } = this.data; | 210 | } = this.data; |
| 211 | // let memberTypeCode = membersShipList[membersShipIndex].memberTypeCode; | ||
| 212 | // let province = provinceList[provinceIndex] && provinceList[provinceIndex].areaName || ""; | ||
| 213 | // let city = cityList[cityIndex] && cityList[cityIndex].areaName || ""; | ||
| 214 | let pics = []; | ||
| 215 | files.forEach(element => { | ||
| 216 | pics.push(element.path) | ||
| 217 | }); | ||
| 218 | |||
| 219 | this.checkSubmit().then((result) => { | ||
| 220 | // 先上传图片到服务器 | ||
| 221 | this.uploadToCustomService(pics).then((result) => { | ||
| 222 | let verifyInfo = { | ||
| 223 | realName: name, | ||
| 224 | province: province, | ||
| 225 | city: city, | ||
| 226 | phone: mobile, | ||
| 227 | verifyCode: verifyCode, | ||
| 228 | memberTypeCode: memberTypeCode, | ||
| 229 | images: result[0] | ||
| 230 | } | ||
| 231 | // app.globalData.verifyInfo = verifyInfo; | ||
| 130 | 232 | ||
| 233 | app.post({ | ||
| 234 | url: app.api.memberIdCommit, | ||
| 235 | data: verifyInfo | ||
| 236 | }).then((result2) => { | ||
| 131 | app.router.push({ | 237 | app.router.push({ |
| 132 | // openType:"redirect", | ||
| 133 | path: "vipVerify" | 238 | path: "vipVerify" |
| 134 | }) | 239 | }) |
| 240 | }); | ||
| 241 | }) | ||
| 242 | }) | ||
| 243 | |||
| 135 | }, | 244 | }, |
| 136 | 245 | ||
| 137 | /** | 246 | /** |
| ... | @@ -206,7 +315,7 @@ Page({ | ... | @@ -206,7 +315,7 @@ Page({ |
| 206 | 'content-type': 'multipart/form-data' | 315 | 'content-type': 'multipart/form-data' |
| 207 | }, | 316 | }, |
| 208 | formData: { | 317 | formData: { |
| 209 | path: '/weapp/zhiliang-light/' | 318 | path: '/weapp/zhiliang-light-upload/' |
| 210 | }, | 319 | }, |
| 211 | // HTTP 请求中其他额外的 form data | 320 | // HTTP 请求中其他额外的 form data |
| 212 | success(res) { | 321 | success(res) { |
| ... | @@ -233,9 +342,7 @@ Page({ | ... | @@ -233,9 +342,7 @@ Page({ |
| 233 | app.post({ | 342 | app.post({ |
| 234 | url: app.api.memberPhone, | 343 | url: app.api.memberPhone, |
| 235 | data: { | 344 | data: { |
| 236 | picVerifyCode: "", | 345 | phone: mobile, |
| 237 | mobile: mobile, | ||
| 238 | forRegister: 1 | ||
| 239 | } | 346 | } |
| 240 | }).then((result) => { | 347 | }).then((result) => { |
| 241 | wx.showToast({ | 348 | wx.showToast({ |
| ... | @@ -263,6 +370,36 @@ Page({ | ... | @@ -263,6 +370,36 @@ Page({ |
| 263 | } | 370 | } |
| 264 | }, 1000) | 371 | }, 1000) |
| 265 | }, | 372 | }, |
| 373 | |||
| 374 | bindPickerChangeProvince(e) { | ||
| 375 | let index = e.detail.value; | ||
| 376 | this.setData({ | ||
| 377 | provinceIndex: index, | ||
| 378 | provinceId: this.data.provinceList[index].areaId, | ||
| 379 | province: this.data.provinceList[index].areaName, | ||
| 380 | cityList: [], | ||
| 381 | cityIndex: -1, | ||
| 382 | }) | ||
| 383 | this.getCity(); | ||
| 384 | }, | ||
| 385 | |||
| 386 | bindPickerChangeCity(e) { | ||
| 387 | let index = e.detail.value; | ||
| 388 | this.setData({ | ||
| 389 | cityIndex: index, | ||
| 390 | cityId: this.data.cityList[index].areaId, | ||
| 391 | city: this.data.cityList[index].areaName, | ||
| 392 | }) | ||
| 393 | }, | ||
| 394 | |||
| 395 | bindMembersShipChange(e) { | ||
| 396 | let index = e.detail.value; | ||
| 397 | this.setData({ | ||
| 398 | membersShipIndex: index, | ||
| 399 | memberTypeName: this.data.membersShipList[index].memberTypeName, | ||
| 400 | }) | ||
| 401 | }, | ||
| 402 | |||
| 266 | bindMobileInput(e) { | 403 | bindMobileInput(e) { |
| 267 | this.setData({ | 404 | this.setData({ |
| 268 | "mobile": e.detail.value | 405 | "mobile": e.detail.value |
| ... | @@ -278,12 +415,7 @@ Page({ | ... | @@ -278,12 +415,7 @@ Page({ |
| 278 | verifyCode: e.detail.value | 415 | verifyCode: e.detail.value |
| 279 | }) | 416 | }) |
| 280 | }, | 417 | }, |
| 281 | bindMembersShipChange(e) { | 418 | |
| 282 | let index = e.detail.value; | ||
| 283 | this.setData({ | ||
| 284 | membersShipIndex: index | ||
| 285 | }) | ||
| 286 | }, | ||
| 287 | 419 | ||
| 288 | hideMask() { | 420 | hideMask() { |
| 289 | // this.setData({ | 421 | // this.setData({ | ... | ... |
| ... | @@ -11,14 +11,11 @@ | ... | @@ -11,14 +11,11 @@ |
| 11 | <view class="label">真实姓名</view> | 11 | <view class="label">真实姓名</view> |
| 12 | <input class="cont" value="{{name}}" bindinput="bindNameInput" placeholder="请输入" /> | 12 | <input class="cont" value="{{name}}" bindinput="bindNameInput" placeholder="请输入" /> |
| 13 | </view> | 13 | </view> |
| 14 | <picker value="{{membersShipIndex}}" range="{{membersShipList}}" range-key="label" bindchange="bindMembersShipChange"> | 14 | <picker value="{{membersShipIndex}}" range="{{membersShipList}}" range-key="memberTypeName" bindchange="bindMembersShipChange"> |
| 15 | <view class="form-item"> | 15 | <view class="form-item"> |
| 16 | <view class="label">会员身份</view> | 16 | <view class="label">会员身份</view> |
| 17 | <!-- <input class="cont" placeholder="请输入" /> --> | 17 | <span class="cont">{{memberTypeName || '请选择'}}</span> |
| 18 | <span class="cont"> | 18 | <view class="exts" data-data="{{contactInfo.contactTel}}"> |
| 19 | {{membersShipList[membersShipIndex].label ? membersShipList[membersShipIndex].label : '请选择'}} | ||
| 20 | </span> | ||
| 21 | <view class="exts" bindtap="onSelectMembersShipHandler" data-data="{{contactInfo.contactTel}}"> | ||
| 22 | <image class="icon" mode="aspectFit" src="../../image/icon/icon-arrow-right.png" /> | 19 | <image class="icon" mode="aspectFit" src="../../image/icon/icon-arrow-right.png" /> |
| 23 | </view> | 20 | </view> |
| 24 | </view> | 21 | </view> |
| ... | @@ -27,11 +24,11 @@ | ... | @@ -27,11 +24,11 @@ |
| 27 | <view class="label">区域</view> | 24 | <view class="label">区域</view> |
| 28 | <view class="cont address"> | 25 | <view class="cont address"> |
| 29 | <picker class="area" bindchange="bindPickerChangeProvince" value="{{provinceIndex}}" range="{{provinceList}}" range-key="areaName"> | 26 | <picker class="area" bindchange="bindPickerChangeProvince" value="{{provinceIndex}}" range="{{provinceList}}" range-key="areaName"> |
| 30 | {{provinceList[provinceIndex].areaName ? provinceList[provinceIndex].areaName : '省'}} | 27 | {{province || '省'}} |
| 31 | </picker> | 28 | </picker> |
| 32 | <view class="line"></view> | 29 | <view class="line"></view> |
| 33 | <picker class="area" bindchange="bindPickerChangeCity" value="{{cityIndex}}" range="{{cityList}}" range-key="areaName"> | 30 | <picker class="area" bindchange="bindPickerChangeCity" value="{{cityIndex}}" range="{{cityList}}" range-key="areaName"> |
| 34 | {{cityList[cityIndex].areaName ? cityList[cityIndex].areaName : '市'}} | 31 | {{city || '市'}} |
| 35 | </picker> | 32 | </picker> |
| 36 | </view> | 33 | </view> |
| 37 | </view> | 34 | </view> | ... | ... |
| ... | @@ -2,6 +2,7 @@ let app = getApp(); | ... | @@ -2,6 +2,7 @@ let app = getApp(); |
| 2 | Page({ | 2 | Page({ |
| 3 | data: { | 3 | data: { |
| 4 | authorizeVisible: false, | 4 | authorizeVisible: false, |
| 5 | verifyInfo: {} | ||
| 5 | }, | 6 | }, |
| 6 | onShareAppMessage() {}, | 7 | onShareAppMessage() {}, |
| 7 | showAuth() { | 8 | showAuth() { |
| ... | @@ -9,5 +10,52 @@ Page({ | ... | @@ -9,5 +10,52 @@ Page({ |
| 9 | authorizeVisible: true | 10 | authorizeVisible: true |
| 10 | }) | 11 | }) |
| 11 | }, | 12 | }, |
| 12 | onLoad(options) {} | 13 | onLoad(options) {}, |
| 14 | onShow() { | ||
| 15 | this.initData(); | ||
| 16 | }, | ||
| 17 | initData() { | ||
| 18 | app.post({ | ||
| 19 | url: app.api.memberIdQuery, | ||
| 20 | data: {}, | ||
| 21 | }).then((result) => { | ||
| 22 | this.setData({ | ||
| 23 | verifyInfo: result | ||
| 24 | }) | ||
| 25 | }) | ||
| 26 | }, | ||
| 27 | |||
| 28 | /** | ||
| 29 | * 图片查看 | ||
| 30 | */ | ||
| 31 | onPreviewImageHandler(evt) { | ||
| 32 | let verifyInfo = this.data.verifyInfo; | ||
| 33 | let current = verifyInfo.images; | ||
| 34 | let urls = [current]; | ||
| 35 | wx.previewImage({ | ||
| 36 | current: current, | ||
| 37 | urls: urls | ||
| 38 | }) | ||
| 39 | }, | ||
| 40 | |||
| 41 | /** | ||
| 42 | * 重新提交 | ||
| 43 | */ | ||
| 44 | onReSubmitHandler() { | ||
| 45 | app.router.push({ | ||
| 46 | openType: "redirect", | ||
| 47 | path: "vipLogin" | ||
| 48 | }); | ||
| 49 | }, | ||
| 50 | |||
| 51 | /** | ||
| 52 | * 修改信息 | ||
| 53 | */ | ||
| 54 | onModifyHandler() { | ||
| 55 | app.router.push({ | ||
| 56 | openType: "redirect", | ||
| 57 | path: "vipLogin" | ||
| 58 | }); | ||
| 59 | }, | ||
| 60 | |||
| 13 | }) | 61 | }) | ... | ... |
| ... | @@ -23,6 +23,9 @@ | ... | @@ -23,6 +23,9 @@ |
| 23 | text-align: center; | 23 | text-align: center; |
| 24 | font-size: 44px; | 24 | font-size: 44px; |
| 25 | color: #333333; | 25 | color: #333333; |
| 26 | width: 600px; | ||
| 27 | padding: 0 75px; | ||
| 28 | display: inline-block; | ||
| 26 | } | 29 | } |
| 27 | 30 | ||
| 28 | .form { | 31 | .form { |
| ... | @@ -48,12 +51,15 @@ | ... | @@ -48,12 +51,15 @@ |
| 48 | 51 | ||
| 49 | .id-card { | 52 | .id-card { |
| 50 | margin: 44px 0 0; | 53 | margin: 44px 0 0; |
| 51 | // width: 338px; | 54 | width: 338px; |
| 52 | // height: 226px; | 55 | height: 226px; |
| 56 | border-radius: 8px; | ||
| 57 | background-color: #fafafa; | ||
| 53 | 58 | ||
| 54 | &-image { | 59 | &-image { |
| 55 | width: 338px; | 60 | width: 338px; |
| 56 | height: 226px; | 61 | height: 226px; |
| 62 | border-radius: 8px; | ||
| 57 | } | 63 | } |
| 58 | } | 64 | } |
| 59 | 65 | ... | ... |
| ... | @@ -4,32 +4,40 @@ | ... | @@ -4,32 +4,40 @@ |
| 4 | <view class="app__content main"> | 4 | <view class="app__content main"> |
| 5 | <view class="top-space"></view> | 5 | <view class="top-space"></view> |
| 6 | <view class="content"> | 6 | <view class="content"> |
| 7 | <view class="tit">信息审核中,请耐心等待</view> | 7 | <text wx:if="{{verifyInfo.auditStatus == 'authorization'}}" class="tit"> |
| 8 | 信息审核通过\n可正常使用本程序 | ||
| 9 | </text> | ||
| 10 | <text wx:elif="{{verifyInfo.auditStatus == 'audit_faild'}}" class="tit"> | ||
| 11 | 抱歉,您提交的信息有误,请重新上传或联系我们 | ||
| 12 | </text> | ||
| 13 | <text wx:else="{{verifyInfo.auditStatus == 'unauthorized'}}" class="tit">信息审核中,请耐心等待</text> | ||
| 8 | <view class="border form"> | 14 | <view class="border form"> |
| 9 | <view class="form-item"> | 15 | <view class="form-item"> |
| 10 | <view class="label">真实姓名</view> | 16 | <view class="label">真实姓名</view> |
| 11 | <view class="val">xxx</view> | 17 | <view class="val">{{verifyInfo.realName}}</view> |
| 12 | </view> | 18 | </view> |
| 13 | <view class="form-item"> | 19 | <view class="form-item"> |
| 14 | <view class="label">会员身份</view> | 20 | <view class="label">会员身份</view> |
| 15 | <view class="val">专业电工</view> | 21 | <view class="val">{{verifyInfo.memberTypeName}}</view> |
| 16 | </view> | 22 | </view> |
| 17 | <view class="form-item"> | 23 | <view class="form-item"> |
| 18 | <view class="label">地区</view> | 24 | <view class="label">地区</view> |
| 19 | <view class="val">广东省深圳市</view> | 25 | <view class="val">{{verifyInfo.province}}{{verifyInfo.city}}</view> |
| 20 | </view> | 26 | </view> |
| 21 | <view class="form-item"> | 27 | <view class="form-item"> |
| 22 | <view class="label">手机号码</view> | 28 | <view class="label">手机号码</view> |
| 23 | <view class="val">15012341234</view> | 29 | <view class="val">{{verifyInfo.phone}}</view> |
| 24 | </view> | 30 | </view> |
| 25 | <view class="id-card"> | 31 | <view class="id-card"> |
| 26 | <image class="id-card-image" mode="aspectFit" src="../../image/icon/icon-id-card-default.png" /> | 32 | <image bindtap="onPreviewImageHandler" class="id-card-image" mode="aspectFill" src="{{verifyInfo.images}}" /> |
| 33 | </view> | ||
| 34 | <view wx:if="{{verifyInfo.auditStatus == 'audit_faild'}}" class="error-tips"> | ||
| 35 | 失败原因:证件不符 | ||
| 27 | </view> | 36 | </view> |
| 28 | <view class="error-tips">失败原因:证件不符</view> | ||
| 29 | </view> | 37 | </view> |
| 30 | <view class="btn-wrap"> | 38 | <view class="btn-wrap"> |
| 31 | <view wx:if="{{1>0}}" class="btn">修改信息</view> | 39 | <view bindtap="onReSubmitHandler" wx:if="{{verifyInfo.auditStatus == 'audit_faild'}}" class="btn">重新提交</view> |
| 32 | <view wx:else class="btn">重新提交</view> | 40 | <view bindtap="onModifyHandler" wx:else class="btn">修改信息</view> |
| 33 | </view> | 41 | </view> |
| 34 | </view> | 42 | </view> |
| 35 | </view> | 43 | </view> | ... | ... |
-
Please register or sign in to post a comment