Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
f9be83eb by simon
Options

默认提交

1 parent 7d291166
Inline Side-by-side
Showing 14 changed files with 296 additions and 149 deletions
1 # chmod u+x git.sh
2 unset msg
3
4 read -p "请输入commit提交的描述: " msg
5
6 if [[ $msg == "" ]]; then
7 msg="默认提交"
8 fi
9 git add -A
10 git commit -m $msg
11 git push
12 git status
...@@ -124,3 +124,8 @@ ...@@ -124,3 +124,8 @@
124 background-color: #3680EB; 124 background-color: #3680EB;
125 125
126 } 126 }
127
128
129 @mixin app-width() {
130 width: 750px;
131 }
......
...@@ -41,13 +41,20 @@ ...@@ -41,13 +41,20 @@
41 } 41 }
42 } 42 }
43 43
44 .btn { 44 .btn-wrap {
45 @include cb(300px, 80px);
46 position: absolute; 45 position: absolute;
47 left: 0; 46 left: 0;
48 right: 0; 47 right: 0;
49 bottom: 80px; 48 bottom: 80px;
50 margin: 0 auto; 49 margin: 0 auto;
50 display: flex;
51 justify-content: center;
52 }
53
54 .btn {
55 @include cb(240px, 80px);
56 margin: 0 24px;
57
51 } 58 }
52 59
53 } 60 }
......
...@@ -6,8 +6,11 @@ ...@@ -6,8 +6,11 @@
6 </view> --> 6 </view> -->
7 <view class="tit">深士照明</view> 7 <view class="tit">深士照明</view>
8 <view class="tips"> 8 <view class="tips">
9 <text >需要获取您的微信昵称等信息才可以获取积分和兑换奖品哦</text> 9 <text>需要获取您的微信昵称等信息才可以获取积分和兑换奖品哦</text>
10 </view> 10 </view>
11 </view> 11 </view>
12 <button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button> 12 <view class="btn-wrap">
13 <button class="btn gray" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button>
14 <button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button>
15 </view>
13 </view> 16 </view>
......
1 @import '../../assets/scss/mixins'; 1 @import '../../assets/scss/mixins';
2 @import '../../assets/scss/utils';
2 3
3 .page { 4 .page {
4 position: relative; 5 position: relative;
5 overflow: hidden; 6 overflow: hidden;
6 7
7 .bgc { 8 .bgc {}
8 // background-color: transparent; 9
9 // background-color: black; 10 .bg {
10 background-color: #fafafc; 11 @include app-width;
12
13 image {
14 @include app-width;
15 }
16 }
17
18 // 右下角图标背景内容补充
19 .br-wrap {
20 $brWidth: 168px;
21 $brHeight: 172px;
22 width: $brWidth;
23 height: $brHeight;
24 position: fixed;
25 bottom: 0;
26 right: 0;
27 background-color: transparent;
28
29 image {
30 width: $brWidth;
31 height: $brHeight;
32 }
11 } 33 }
12 34
13 35
14 .main {
15 36
37 .main {
16 position: relative; 38 position: relative;
39 min-height: 1206px;
17 40
18 .top-space { 41 .content {
19 height: 60px; 42 position: relative;
20 } 43 }
21 44
45 .login-wrap {
46 padding-top: 886px;
22 47
23 .login { 48 .terms-wrap {
24 position: relative; 49 margin-top: 24px;
25 width: 650px; 50 display: flex;
26 margin: 0 auto; 51 justify-content: center;
27 text-align: center; 52 margin-bottom: 16px;
53 font-size: 28px;
54 color: #333333;
28 55
29 &-logo { 56 .terms {
30 width: 140px; 57 text-align: center;
31 height: 140px; 58 padding: 0 12px;
32 }
33 59
34 &-name { 60 .t1 {
35 margin-top: 32px; 61 color: #4bc2ed;
36 font-size: 32px; 62 display: inline-block;
37 color: #333333; 63 }
64 }
38 } 65 }
39 66
40 &-line { 67
41 margin-top: 70px; 68
42 width: 650px; 69 .login-btn {
43 height: 2px; 70 width: 340px;
44 background-color: #eaeaec; 71 height: 80px;
72 line-height: 80px;
73 border-radius: 40px;
74 border: solid 3px #4bc2ed;
75 margin: 0 auto;
76 font-size: 36px;
77 color: #4bc2ed;
78 text-align: center;
79 background-color: transparent;
45 } 80 }
46 81
47 &-title { 82 .gray {
48 margin-top: 40px; 83 color: #8f8f8f;
49 font-size: 32px; 84 border-color: #8f8f8f;
50 text-align: left;
51 color: #333333;
52 } 85 }
86 }
87 }
53 88
89 }
54 90
55 &-tips { 91 .space1 {
56 margin-top: 28px; 92 height: 116px;
57 font-size: 26px; 93 }
58 text-align: left;
59 color: #666666;
60 }
61 94
62 &-btn {
63 margin-top: 102px;
64 width: 650px;
65 height: 90px;
66 line-height: 90px;
67 border-radius: 8px;
68 background-color: #00c200;
69 font-size: 32px;
70 color: #ffffff;
71 }
72 95
96 .terms-cont {
97 width: 690px;
98 height: 1000px;
99 position: relative;
100 background-color: #fff;
101
102 .cont {
103 position: relative;
104 width: 690px;
105 height: 900px;
106 overflow: auto;
107 padding: 28px;
108 @extend .bb;
109 font-size: 24px;
110
111
112 .tit {
113 text-align: center;
114 font-size: 32px;
115 font-weight: bold;
73 } 116 }
74 117
118 .desc {}
119
120 .t1 {
121 color: #4bc2ed;
122 display: inline-block;
123 margin-top: 16px;
124 }
75 } 125 }
76 126
127 .btn {
128
129 position: absolute;
130 bottom: 0;
131 left: 0;
132 right: 0;
133 }
77 } 134 }
......
...@@ -33,7 +33,7 @@ Page({ ...@@ -33,7 +33,7 @@ Page({
33 // }) 33 // })
34 this.queryMember().then((result) => { 34 this.queryMember().then((result) => {
35 this.setData({ 35 this.setData({
36 name:result.nickname 36 name: result.nickname
37 }) 37 })
38 }); 38 });
39 }, 39 },
...@@ -100,13 +100,13 @@ Page({ ...@@ -100,13 +100,13 @@ Page({
100 }) 100 })
101 return; 101 return;
102 } 102 }
103 if (pics.length <= 0) { 103 // if (pics.length <= 0) {
104 wx.showToast({ 104 // wx.showToast({
105 title: "请上传图片", 105 // title: "请上传图片",
106 icon: 'none' 106 // icon: 'none'
107 }) 107 // })
108 return; 108 // return;
109 } 109 // }
110 110
111 111
112 // 上传图片到服务器 112 // 上传图片到服务器
...@@ -118,7 +118,7 @@ Page({ ...@@ -118,7 +118,7 @@ Page({
118 name: name, 118 name: name,
119 phone: phone, 119 phone: phone,
120 messageContant: messageContant, 120 messageContant: messageContant,
121 images: result.join(','), 121 images: result && result.length > 0 ? result.join(',') : "",
122 } 122 }
123 }).then((result2) => { 123 }).then((result2) => {
124 this.setData({ 124 this.setData({
...@@ -135,25 +135,26 @@ Page({ ...@@ -135,25 +135,26 @@ Page({
135 uploadToCustomService(urlList) { 135 uploadToCustomService(urlList) {
136 let _this = this; 136 let _this = this;
137 return new Promise((resolve, reject) => { 137 return new Promise((resolve, reject) => {
138 // promise列表 138 if (urlList && urlList.length > 0) {
139 let p = []; 139 let p = [];
140 // 用promise上传音频 140 urlList.forEach(element => {
141 urlList.forEach(element => { 141 let myPromise = new Promise((resolve2, reject2) => {
142 let myPromise = new Promise((resolve2, reject2) => { 142 _this.uploadfileMultiple(element).then((result2) => {
143 _this.uploadfileMultiple(element).then((result2) => { 143 resolve2(result2)
144 resolve2(result2) 144 }).catch((err) => {
145 }).catch((err) => { 145 reject2();
146 // _this.tip("声音上传失败") 146 });
147 reject2();
148 }); 147 });
148 p.push(myPromise);
149 }); 149 });
150 p.push(myPromise); 150 Promise.all(p).then(uploadFiles => {
151 }); 151 resolve(uploadFiles)
152 Promise.all(p).then(uploadFiles => { 152 }, reason => {
153 resolve(uploadFiles) 153 reject();
154 }, reason => { 154 });
155 reject(); 155 } else {
156 }); 156 resolve([]);
157 }
157 }); 158 });
158 }, 159 },
159 /** 160 /**
......
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
15 <view class="label">生产地址</view> 15 <view class="label">生产地址</view>
16 <text class="val">{{contactInfo.contactCompany}}</text> 16 <text class="val">{{contactInfo.contactCompany}}</text>
17 </view> 17 </view>
18 <view class="form-item"> 18 <!-- <view class="form-item">
19 <view class="label">电话</view> 19 <view class="label">电话</view>
20 <text class="val">{{contactInfo.contactTel}}</text> 20 <text class="val">{{contactInfo.contactTel}}</text>
21 <view class="exts" bindtap="onMakePhoneCallHandler" data-data="{{contactInfo.contactTel}}"> 21 <view class="exts" bindtap="onMakePhoneCallHandler" data-data="{{contactInfo.contactTel}}">
22 <image class="icon" mode="aspectFit" src="../../image/contact/contact-c2.png" /> 22 <image class="icon" mode="aspectFit" src="../../image/contact/contact-c2.png" />
23 </view> 23 </view>
24 </view> 24 </view> -->
25 <view class="form-item"> 25 <view class="form-item">
26 <view class="label">手机</view> 26 <view class="label">手机</view>
27 <text class="val">{{contactInfo.contactPhone}}</text> 27 <text class="val">{{contactInfo.contactPhone}}</text>
......
...@@ -142,6 +142,12 @@ Page({ ...@@ -142,6 +142,12 @@ Page({
142 this.hideMask(); 142 this.hideMask();
143 break; 143 break;
144 144
145 // 授权完毕
146 case "_evt_auth_complete":
147 this.resetPage();
148 this.queryProduct();
149 break;
150
145 default: 151 default:
146 break; 152 break;
147 } 153 }
......
...@@ -18,7 +18,6 @@ Page({ ...@@ -18,7 +18,6 @@ Page({
18 userInfo: {}, //用户信息 18 userInfo: {}, //用户信息
19 code: "", // 手输入码 / 扫出的积分码 19 code: "", // 手输入码 / 扫出的积分码
20 memberCode: "", // 扫出的用户码 20 memberCode: "", // 扫出的用户码
21 // integralCode: "", // 扫出的积分码
22 }, 21 },
23 onShareAppMessage() {}, 22 onShareAppMessage() {},
24 showAuth() { 23 showAuth() {
...@@ -28,17 +27,19 @@ Page({ ...@@ -28,17 +27,19 @@ Page({
28 }, 27 },
29 onLoad(options) { 28 onLoad(options) {
30 let q = decodeURIComponent(options.q); 29 let q = decodeURIComponent(options.q);
30 // 获取会员码
31 let m = getQueryByUrl("m", q);
32 // 获取积分码
33 let c = getQueryByUrl("c", q);
34
31 if (q) { 35 if (q) {
32 // 获取会员码 36 // 设置会员码
33 let m = getQueryByUrl("m", q);
34 if (m) { 37 if (m) {
35 this.setData({ 38 this.setData({
36 memberCode: m 39 memberCode: m
37 }) 40 })
38 } 41 }
39 42 // 设置积分码
40 // 获取积分码
41 let c = getQueryByUrl("c", q);
42 if (c) { 43 if (c) {
43 this.setData({ 44 this.setData({
44 code: c 45 code: c
...@@ -48,7 +49,9 @@ Page({ ...@@ -48,7 +49,9 @@ Page({
48 this.queryProduct(); 49 this.queryProduct();
49 this.queryBanner(); 50 this.queryBanner();
50 51
51 this.initData(); 52 if (m || c) {
53 this.initData();
54 }
52 }, 55 },
53 56
54 onShow() { 57 onShow() {
...@@ -63,15 +66,16 @@ Page({ ...@@ -63,15 +66,16 @@ Page({
63 } = this.data; 66 } = this.data;
64 // 如果存在扫码参数，则需要拉用户身份(未授权的情况下 要拉授权) 67 // 如果存在扫码参数，则需要拉用户身份(未授权的情况下 要拉授权)
65 this.queryMember().then((result) => { 68 this.queryMember().then((result) => {
69 // 扫用户码
66 this.queryScanPersonQrcode().then((result2) => { 70 this.queryScanPersonQrcode().then((result2) => {
71 // 查询积分码
67 if (code) { 72 if (code) {
68 this.onSearchHandler(); 73 this.querySearchIntegralQrcode();
69 } 74 }
70 }); 75 });
71 }); 76 });
72 }, 77 },
73 78
74
75 // 到达底部 79 // 到达底部
76 onReachBottom() { 80 onReachBottom() {
77 if (this.data.productList.length < this.data.total) { 81 if (this.data.productList.length < this.data.total) {
...@@ -147,7 +151,7 @@ Page({ ...@@ -147,7 +151,7 @@ Page({
147 }, 151 },
148 152
149 /** 153 /**
150 * 扫个人码 154 * 扫个人码 做任务，用户无感知
151 * 如果没有码，直接返回 155 * 如果没有码，直接返回
152 */ 156 */
153 queryScanPersonQrcode() { 157 queryScanPersonQrcode() {
...@@ -171,21 +175,38 @@ Page({ ...@@ -171,21 +175,38 @@ Page({
171 }); 175 });
172 }, 176 },
173 177
178
179
174 /** 180 /**
175 * 点击详情 181 * 请求积分码
182 * 通过搜索查询
176 */ 183 */
177 onProductItemHandler(evt) { 184 querySearchIntegralQrcode() {
178 let curProductDetail = getBindtapData(evt); 185 let code = this.data.code;
179 this.setData({ 186 this.setData({
180 curProductDetail: curProductDetail, 187 code: ""
181 productDetailVisible: true 188 })
189 if (code.length != 16) {
190 wx.showModal({
191 content: '请输入16位积分码',
192 showCancel: false,
193 success(res) {}
194 })
195 return;
196 }
197 app.router.push({
198 path: "scanResult",
199 query: {
200 code: code
201 }
182 }) 202 })
183 }, 203 },
184 204
185 /** 205 /**
186 * 点击扫码按钮 206 * 请求积分码
207 * 通过扫码
187 */ 208 */
188 onScanHandler() { 209 queryScanIntegralQrcode() {
189 let _this = this; 210 let _this = this;
190 wx.scanCode({ 211 wx.scanCode({
191 onlyFromCamera: true, 212 onlyFromCamera: true,
...@@ -222,36 +243,59 @@ Page({ ...@@ -222,36 +243,59 @@ Page({
222 } 243 }
223 }, 244 },
224 fail(err) { 245 fail(err) {
225 console.log("err:", err); 246 let isCancel = err.errMsg.indexOf("cancel") != -1;
247 if (!isCancel) {
248 wx.showModal({
249 content: '未发现积分码，换一个二维码试试',
250 showCancel: false,
251 success(res) {}
252 })
253 }
226 } 254 }
227 }) 255 })
228 }, 256 },
229 257
258
230 /** 259 /**
231 * 点击搜索 260 * 点击详情
232 */ 261 */
233 onSearchHandler() { 262 onProductItemHandler(evt) {
234 let code = this.data.code; 263 let curProductDetail = getBindtapData(evt);
235 this.setData({ 264 this.setData({
236 code: "" 265 curProductDetail: curProductDetail,
266 productDetailVisible: true
237 }) 267 })
238 if (code.length != 16) { 268 },
239 wx.showModal({ 269
240 content: '请输入16位积分码', 270 /**
241 showCancel: false, 271 * 点击扫码按钮
242 success(res) {} 272 */
243 }) 273 onScanHandler() {
274 if (!this.data.userInfo.memberCode) {
275 this.queryMember().then((result) => {
276 this.queryScanIntegralQrcode();
277 });
244 return; 278 return;
279 } else {
280 this.queryScanIntegralQrcode();
245 } 281 }
246 app.router.push({
247 path: "scanResult",
248 query: {
249 code: code
250 }
251 })
252 }, 282 },
253 283
254 /** 284 /**
285 * 点击查询按钮
286 */
287 onSearchHandler() {
288 if (!this.data.userInfo.memberCode) {
289 this.queryMember().then((result) => {
290 this.querySearchIntegralQrcode();
291 });
292 } else {
293 this.querySearchIntegralQrcode();
294 }
295 },
296
297
298 /**
255 * 绑定手输code 299 * 绑定手输code
256 * @param {*} e 300 * @param {*} e
257 */ 301 */
......
...@@ -48,16 +48,6 @@ ...@@ -48,16 +48,6 @@
48 </view> 48 </view>
49 </view> 49 </view>
50 <!-- 7天签到 --> 50 <!-- 7天签到 -->
51 <!-- <view class="check">
52 <view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item {{item ? 'check-item-act' :''}}">
53 <view class="no">{{index+1}}</view>
54 <view class="icon">
55 <image wx:if="{{item}}" mode="aspectFit" src="../../image/icon/icon-check.png" />
56 <image wx:elif="{{index == signInfo.length-1}}" mode="aspectFit" src="../../image/icon/icon-red-package.png" />
57 <image wx:else mode="aspectFit" src="../../image/icon/icon-integral.png" />
58 </view>
59 </view>
60 </view> -->
61 <view class="check"> 51 <view class="check">
62 <view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item {{item ? 'check-item-act' :''}}"> 52 <view wx:for="{{signInfo}}" wx:key="{{index}}" class="check-item {{item ? 'check-item-act' :''}}">
63 <view wx:if="{{index != 0}}" class="line"></view> 53 <view wx:if="{{index != 0}}" class="line"></view>
......
...@@ -9,6 +9,7 @@ Page({ ...@@ -9,6 +9,7 @@ Page({
9 authorizeVisible: false, 9 authorizeVisible: false,
10 // form start 10 // form start
11 name: "", 11 name: "",
12 shopName: "",
12 mobile: "", 13 mobile: "",
13 verifyCode: "", 14 verifyCode: "",
14 imageUrl: "", 15 imageUrl: "",
...@@ -27,6 +28,7 @@ Page({ ...@@ -27,6 +28,7 @@ Page({
27 memberTypeName: "", // label 28 memberTypeName: "", // label
28 memberTypeCode: "", // 码 29 memberTypeCode: "", // 码
29 // form end 30 // form end
31 isModify: false,
30 }, 32 },
31 onShareAppMessage() {}, 33 onShareAppMessage() {},
32 showAuth() { 34 showAuth() {
...@@ -35,6 +37,9 @@ Page({ ...@@ -35,6 +37,9 @@ Page({
35 }) 37 })
36 }, 38 },
37 onLoad(options) { 39 onLoad(options) {
40 this.setData({
41 isModify: options && options.type == "modify"
42 })
38 this.initData(); 43 this.initData();
39 }, 44 },
40 initData() { 45 initData() {
...@@ -149,12 +154,7 @@ Page({ ...@@ -149,12 +154,7 @@ Page({
149 return new Promise((resolve, reject) => { 154 return new Promise((resolve, reject) => {
150 let { 155 let {
151 name, 156 name,
152 // membersShipIndex, 157 shopName,
153 // membersShipList,
154 // provinceList,
155 // provinceIndex,
156 // cityList,
157 // cityIndex,
158 memberTypeCode, 158 memberTypeCode,
159 province, 159 province,
160 city, 160 city,
...@@ -162,9 +162,6 @@ Page({ ...@@ -162,9 +162,6 @@ Page({
162 verifyCode, 162 verifyCode,
163 files 163 files
164 } = this.data; 164 } = this.data;
165 // let memberTypeCode = membersShipList[membersShipIndex].memberTypeCode;
166 // let province = provinceList[provinceIndex] && provinceList[provinceIndex].areaName || "";
167 // let city = cityList[cityIndex] && cityList[cityIndex].areaName || "";
168 let pics = []; 165 let pics = [];
169 files.forEach(element => { 166 files.forEach(element => {
170 pics.push(element.path) 167 pics.push(element.path)
...@@ -208,12 +205,7 @@ Page({ ...@@ -208,12 +205,7 @@ Page({
208 onSubmitHandler() { 205 onSubmitHandler() {
209 let { 206 let {
210 name, 207 name,
211 // membersShipIndex, 208 shopName,
212 // membersShipList,
213 // provinceList,
214 // provinceIndex,
215 // cityList,
216 // cityIndex,
217 memberTypeCode, 209 memberTypeCode,
218 province, 210 province,
219 city, 211 city,
...@@ -221,9 +213,6 @@ Page({ ...@@ -221,9 +213,6 @@ Page({
221 verifyCode, 213 verifyCode,
222 files 214 files
223 } = this.data; 215 } = this.data;
224 // let memberTypeCode = membersShipList[membersShipIndex].memberTypeCode;
225 // let province = provinceList[provinceIndex] && provinceList[provinceIndex].areaName || "";
226 // let city = cityList[cityIndex] && cityList[cityIndex].areaName || "";
227 let pics = []; 216 let pics = [];
228 files.forEach(element => { 217 files.forEach(element => {
229 pics.push(element.path) 218 pics.push(element.path)
...@@ -234,6 +223,7 @@ Page({ ...@@ -234,6 +223,7 @@ Page({
234 this.uploadToCustomService(pics).then((result) => { 223 this.uploadToCustomService(pics).then((result) => {
235 let verifyInfo = { 224 let verifyInfo = {
236 realName: name, 225 realName: name,
226 storeName: shopName,
237 province: province, 227 province: province,
238 city: city, 228 city: city,
239 phone: mobile, 229 phone: mobile,
...@@ -241,7 +231,6 @@ Page({ ...@@ -241,7 +231,6 @@ Page({
241 memberTypeCode: memberTypeCode, 231 memberTypeCode: memberTypeCode,
242 images: result[0] 232 images: result[0]
243 } 233 }
244 // app.globalData.verifyInfo = verifyInfo;
245 234
246 app.post({ 235 app.post({
247 url: app.api.memberIdCommit, 236 url: app.api.memberIdCommit,
...@@ -260,6 +249,8 @@ Page({ ...@@ -260,6 +249,8 @@ Page({
260 * 调起微信图片上传 249 * 调起微信图片上传
261 */ 250 */
262 onUploadHandler() { 251 onUploadHandler() {
252 console.log("this.options.type:", this.options.type);
253 if (this.options.type == "modify") return; //修改模式不让改图片
263 let _this = this; 254 let _this = this;
264 let count = _this.data.maxImg - _this.data.length; 255 let count = _this.data.maxImg - _this.data.length;
265 wx.chooseImage({ 256 wx.chooseImage({
...@@ -424,6 +415,11 @@ Page({ ...@@ -424,6 +415,11 @@ Page({
424 name: e.detail.value 415 name: e.detail.value
425 }) 416 })
426 }, 417 },
418 bindShopNameInput(e) {
419 this.setData({
420 shopName: e.detail.value
421 })
422 },
427 bindVerifyCodeInput(e) { 423 bindVerifyCodeInput(e) {
428 this.setData({ 424 this.setData({
429 verifyCode: e.detail.value 425 verifyCode: e.detail.value
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
41 41
42 .address { 42 .address {
43 display: flex; 43 display: flex;
44
44 .area { 45 .area {
45 width: 220px; 46 width: 220px;
46 color: #333333; 47 color: #333333;
...@@ -124,6 +125,21 @@ ...@@ -124,6 +125,21 @@
124 @include cb(320px, 84px); 125 @include cb(320px, 84px);
125 margin: 40px auto 0; 126 margin: 40px auto 0;
126 } 127 }
128
129 .submit-tips {
130 margin: 12px 0;
131 width: 100%;
132 color: #333333;
133 text-align: center;
134 line-height: 24px;
135
136 .text {
137 font-size: 20px;
138 }
139 }
127 } 140 }
128 } 141 }
142 .modify{
143 color: #888888 !important;
144 }
129 } 145 }
......
...@@ -9,25 +9,29 @@ ...@@ -9,25 +9,29 @@
9 <view class="form"> 9 <view class="form">
10 <view class="form-item"> 10 <view class="form-item">
11 <view class="label">真实姓名</view> 11 <view class="label">真实姓名</view>
12 <input class="cont" value="{{name}}" bindinput="bindNameInput" placeholder="请输入" /> 12 <input disabled="{{isModify}}" class="cont {{isModify ? 'modify' :''}}" value="{{name}}" bindinput="bindNameInput" placeholder="请输入" />
13 </view> 13 </view>
14 <picker value="{{membersShipIndex}}" range="{{membersShipList}}" range-key="memberTypeName" bindchange="bindMembersShipChange"> 14 <view class="form-item">
15 <view class="label">店名</view>
16 <input disabled="{{isModify}}" class="cont {{isModify ? 'modify' :''}}" value="{{shopName}}" bindinput="bindShopNameInput" placeholder="选填" />
17 </view>
18 <picker disabled="{{isModify}}" value="{{membersShipIndex}}" range="{{membersShipList}}" range-key="memberTypeName" bindchange="bindMembersShipChange">
15 <view class="form-item"> 19 <view class="form-item">
16 <view class="label">会员身份</view> 20 <view class="label">会员身份</view>
17 <span class="cont">{{memberTypeName || '请选择'}}</span> 21 <span class="cont {{isModify ? 'modify' :''}}">{{memberTypeName || '请选择'}}</span>
18 <view class="exts" data-data="{{contactInfo.contactTel}}"> 22 <view class="exts" data-data="{{contactInfo.contactTel}}">
19 <image class="icon" mode="aspectFit" src="../../image/icon/icon-arrow-right.png" /> 23 <image class="icon" mode="aspectFit" src="../../image/icon/icon-arrow-right.png" />
20 </view> 24 </view>
21 </view> 25 </view>
22 </picker> 26 </picker>
23 <view class="form-item"> 27 <view class="form-item">
24 <view class="label">区域</view> 28 <view class="label">销售区域</view>
25 <view class="cont address"> 29 <view class="cont address">
26 <picker class="area" bindchange="bindPickerChangeProvince" value="{{provinceIndex}}" range="{{provinceList}}" range-key="areaName"> 30 <picker disabled="{{isModify}}" class="area {{isModify ? 'modify' :''}}" bindchange="bindPickerChangeProvince" value="{{provinceIndex}}" range="{{provinceList}}" range-key="areaName">
27 {{province || '省'}} 31 {{province || '省'}}
28 </picker> 32 </picker>
29 <view class="line"></view> 33 <view class="line"></view>
30 <picker class="area" bindchange="bindPickerChangeCity" value="{{cityIndex}}" range="{{cityList}}" range-key="areaName"> 34 <picker disabled="{{isModify}}" class="area {{isModify ? 'modify' :''}}" bindchange="bindPickerChangeCity" value="{{cityIndex}}" range="{{cityList}}" range-key="areaName">
31 {{city || '市'}} 35 {{city || '市'}}
32 </picker> 36 </picker>
33 </view> 37 </view>
...@@ -39,7 +43,7 @@ ...@@ -39,7 +43,7 @@
39 <view class="form-item"> 43 <view class="form-item">
40 <view class="label">验证码</view> 44 <view class="label">验证码</view>
41 <input class="cont" bindinput="bindVerifyCodeInput" type="number" placeholder="请输入" /> 45 <input class="cont" bindinput="bindVerifyCodeInput" type="number" placeholder="请输入" />
42 <view value="{{verifyCode}}" class="exts" bindtap="onSelectMembersShipHandler" data-data="{{contactInfo.contactTel}}"> 46 <view value="{{verifyCode}}" class="exts">
43 <view bindtap="reqGetSmsRequest" class="code"> 47 <view bindtap="reqGetSmsRequest" class="code">
44 {{sendAuthCode ? "获取验证码": auth_time+"(s)"}} 48 {{sendAuthCode ? "获取验证码": auth_time+"(s)"}}
45 </view> 49 </view>
...@@ -62,6 +66,9 @@ ...@@ -62,6 +66,9 @@
62 </view> 66 </view>
63 <!-- 提交按钮 --> 67 <!-- 提交按钮 -->
64 <view class="submit-btn" bindtap="onSubmitHandler">确认提交</view> 68 <view class="submit-btn" bindtap="onSubmitHandler">确认提交</view>
69 <view class="submit-tips">
70 <text class="text">五金分销商请上传营业执照，其他用户上传身份证或电工证\n审核后可参与签到及兑换积分</text>
71 </view>
65 </view> 72 </view>
66 </view> 73 </view>
67 </view> 74 </view>
......
...@@ -54,7 +54,10 @@ Page({ ...@@ -54,7 +54,10 @@ Page({
54 onModifyHandler() { 54 onModifyHandler() {
55 app.router.push({ 55 app.router.push({
56 openType: "redirect", 56 openType: "redirect",
57 path: "vipLogin" 57 path: "vipLogin",
58 query: {
59 type: "modify"
60 }
58 }); 61 });
59 }, 62 },
60 63
......