Commit 6e6de4e6feac12bc68e25e54480676b50d2ed0ed
1 parent
555e2a0e
修改整体颜色
Showing
7 changed files
with
62 additions
and
26 deletions
src/utils/utils.js
... | ... | @@ -209,7 +209,7 @@ export default { |
209 | 209 | deviceInfo: this.myDeviceInfo, |
210 | 210 | salt: salt, |
211 | 211 | sign_type: "md5", |
212 | - token: sessionStorage.getItem("wx_Token"), //c23849735f3442f3b95f7bec816317ae sessionStorage.getItem("wx_Token") | |
212 | + token: sessionStorage.getItem("wx_Token"), //c23849735f3442f3b95f7bec816317ae sessionStorage.getItem("wx_Token") | |
213 | 213 | orgId: this.myOrgId |
214 | 214 | }; |
215 | 215 | return reqData; | ... | ... |
src/views/binding/binDing.vue
... | ... | @@ -4,12 +4,12 @@ |
4 | 4 | <mt-field label="手机号" placeholder="请输入正确的手机号" type="tel" v-model="phone" :attr="{ maxlength: 13 }"></mt-field> |
5 | 5 | |
6 | 6 | <mt-field label="验证码" v-model="codeText"> |
7 | - <button class="getCode" @click="getCode" :disabled="disabled">{{btntxt}} | |
7 | + <button class="getCode" @click="getCode" :disabled="disabled">{{btntxt}} | |
8 | 8 | </button> |
9 | 9 | </mt-field> |
10 | 10 | |
11 | 11 | <div style="margin-top: 34px" class="leftRightPadding"> |
12 | - <mt-button type="danger" size="large" @click.native="bindphone">绑定</mt-button> | |
12 | + <mt-button type="primary" size="large" @click.native="bindphone">绑定</mt-button> | |
13 | 13 | </div> |
14 | 14 | </div> |
15 | 15 | </template> |
... | ... | @@ -148,7 +148,7 @@ export default { |
148 | 148 | width: 120px; |
149 | 149 | height: 48px; |
150 | 150 | line-height: 48px; |
151 | - background: #ef4f4f; | |
151 | + background: #26a2ff; | |
152 | 152 | color: #fff; |
153 | 153 | text-align: center; |
154 | 154 | border: 0; | ... | ... |
src/views/cards/Cards.vue
... | ... | @@ -44,7 +44,8 @@ |
44 | 44 | |
45 | 45 | |
46 | 46 | </div> |
47 | - <x-button type="primary" @click.native="$router.push({path:'buyCard'})">购买会员卡</x-button> | |
47 | + <!--<x-button type="primary" ></x-button>--> | |
48 | + <mt-button type="primary" size="large" @click.native="$router.push({path:'buyCard'})">购买会员卡</mt-button> | |
48 | 49 | </div> |
49 | 50 | </template> |
50 | 51 | ... | ... |
src/views/cards/buyCard.vue
... | ... | @@ -45,9 +45,9 @@ |
45 | 45 | <li> |
46 | 46 | <div style="color: #666">购买数量</div> |
47 | 47 | <div class="choose-num"> |
48 | - <span @click="addCardNum">+</span> | |
49 | - <span>{{cardNum}}</span> | |
50 | 48 | <span @click="reduceCarNum">-</span> |
49 | + <span>{{cardNum}}</span> | |
50 | + <span @click="addCardNum">+</span> | |
51 | 51 | </div> |
52 | 52 | </li> |
53 | 53 | |
... | ... | @@ -87,7 +87,7 @@ |
87 | 87 | |
88 | 88 | |
89 | 89 | <div style="margin-top: 34px" class="leftRightPadding"> |
90 | - <mt-button type="danger" size="large" @click="toPay">确定购买</mt-button> | |
90 | + <mt-button type="primary" size="large" @click="toPay">确定购买</mt-button> | |
91 | 91 | </div> |
92 | 92 | |
93 | 93 | <!-- @touchmove.prevent 阻止默认事件,在选择时间时阻止页面也跟着滚动--> |
... | ... | @@ -196,11 +196,11 @@ export default { |
196 | 196 | carNumberVisible: false, |
197 | 197 | parkMoreVisible: false, |
198 | 198 | cardNum: 1, // 卡数量 |
199 | - unitPrice: 10, // 单价 | |
200 | - disPrice: 9, // 优惠金额 | |
201 | - needPay: 1, // 应付 | |
199 | + unitPrice: 0, // 单价 | |
200 | + disPrice: 0, // 优惠金额 | |
201 | + needPay: 0, // 应付 | |
202 | 202 | agreement: false, |
203 | - typeNum: 1, // 卡类型判断 | |
203 | + typeNum: 0, // 卡类型判断 | |
204 | 204 | showHideOnBlur: false, // 购买协议 |
205 | 205 | createVipCardOrder: {}, // 创建订单对象 |
206 | 206 | orderId: "" // 订单号 |
... | ... | @@ -274,7 +274,7 @@ export default { |
274 | 274 | }, |
275 | 275 | // 打开时间选择器 |
276 | 276 | selectData() { |
277 | - // this.dateVal = this.startData | |
277 | + this.dateVal = this.startData | |
278 | 278 | this.$refs["datePicker"].open(); |
279 | 279 | // console.log(this.startData) |
280 | 280 | // this.endDate = this.startData.setMonth(this.startData.getMonth()+1) |
... | ... | @@ -302,6 +302,7 @@ export default { |
302 | 302 | }); |
303 | 303 | }, |
304 | 304 | handleConfirm() { |
305 | + console.log('11111'); | |
305 | 306 | console.log(this.dateVal); |
306 | 307 | this.startData = this.$utils.timestampToTime(this.dateVal); |
307 | 308 | // this.endDate = this.dateVal.setMonth(this.dateVal.getMonth() + 1); | ... | ... |
src/views/cards/renew.vue
... | ... | @@ -45,9 +45,9 @@ |
45 | 45 | <li> |
46 | 46 | <div style="color: #666">购买数量</div> |
47 | 47 | <div class="choose-num"> |
48 | - <span @click="addCardNum">+</span> | |
49 | - <span>{{cardNum}}</span> | |
50 | 48 | <span @click="reduceCarNum">-</span> |
49 | + <span>{{cardNum}}</span> | |
50 | + <span @click="addCardNum">+</span> | |
51 | 51 | </div> |
52 | 52 | </li> |
53 | 53 | |
... | ... | @@ -79,7 +79,7 @@ |
79 | 79 | |
80 | 80 | |
81 | 81 | <div style="margin-top: 34px" class="leftRightPadding"> |
82 | - <mt-button type="danger" size="large" @click="toPay">确定购买</mt-button> | |
82 | + <mt-button type="primary" size="large" @click="toPay">确定购买</mt-button> | |
83 | 83 | </div> |
84 | 84 | |
85 | 85 | |
... | ... | @@ -268,7 +268,7 @@ export default { |
268 | 268 | jsondata.terminalSource = "3"; // 请求端来源 1: 任你停 2:pda 3:微信公共号 |
269 | 269 | jsondata.paySource = "3"; |
270 | 270 | jsondata.couponPersonId = ""; |
271 | - jsondata.openId = 'o0Moh6eQhTm5bZVqT6wjdSUsZonM'; // o0Moh6eQhTm5bZVqT6wjdSUsZonM sessionStorage.getItem("wx_openId") | |
271 | + jsondata.openId = sessionStorage.getItem("wx_openId"); // o0Moh6eQhTm5bZVqT6wjdSUsZonM sessionStorage.getItem("wx_openId") | |
272 | 272 | jsondata.sign = this.$utils.signObject(jsondata); |
273 | 273 | weixinpay(jsondata).then(res => { |
274 | 274 | console.log(data); | ... | ... |
src/views/mySelf/feedback/suggestionBack.vue
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | <mt-field label="" placeholder="请详细描述反馈问题,或提出改进建议。(300字以内)" type="textarea" rows="4" v-model.trim="introduction" :attr="{ maxlength: 300 }"></mt-field> |
18 | 18 | |
19 | 19 | <div style="margin-top: 34px"> |
20 | - <mt-button type="danger" size="large" @click="saveHandle">提交</mt-button> | |
20 | + <mt-button type="primary" size="large" @click="saveHandle">提交</mt-button> | |
21 | 21 | </div> |
22 | 22 | </div> |
23 | 23 | </template> | ... | ... |
src/views/mySelf/selfNav.vue
1 | 1 | <template> |
2 | 2 | <div> |
3 | 3 | <div class="person-bg"> |
4 | + | |
5 | + <svg class="demo__top-svgBg" viewBox="0 0 366 256"> | |
6 | + <g class="svgBg__objects"> | |
7 | + <path class="svgBg__bg svgBg__bg1" fill="#86D7DB" d="M0,143 88,107 224,153 348,109 366,123 366,256 0,256z" /> | |
8 | + <path class="svgBg__bg svgBg__bg2" fill="#3C929A" d="M0,156 106,136 272,172 342,124 366,144 366,256 0,256z" /> | |
9 | + <path class="svgBg__bg svgBg__bg3" fill="#416175" d="M0,170 62,160 235,148 305,145 366,153 366,256 0,256z" /> | |
10 | + <g class="svgBg__tree svgBg__tree-1 m--left" data-id="1"> | |
11 | + <path class="svgBg__tree-leafs svgBg__tree-part" fill="#389296" d="M54,127 C77,127 62,95 54,63 C46,95 31,127 54,127" /> | |
12 | + <path class="svgBg__tree-trunk svgBg__tree-part" d="M56,147 Q55,115 54,83 Q53,115 52,146" /> | |
13 | + </g> | |
14 | + <g class="svgBg__tree svgBg__tree-2 m--left" data-id="2"> | |
15 | + <path class="svgBg__tree-leafs svgBg__tree-part" fill="#389296" d="M67,124 C90,124 75,92 67,59 C59,92 44,124 67,124" /> | |
16 | + <path class="svgBg__tree-trunk svgBg__tree-part" d="M69,144 Q68,112 67,80 Q66,112 65,143" /> | |
17 | + </g> | |
18 | + <g class="svgBg__tree svgBg__tree-3 m--right" data-id="3"> | |
19 | + <path class="svgBg__tree-leafs svgBg__tree-part" fill="#389296" d="M264,129 C287,129 272,97 264,64 C256,97 241,129 264,129" /> | |
20 | + <path class="svgBg__tree-trunk svgBg__tree-part" d="M266,149 Q265,117 264,85 Q263,117 262,148" /> | |
21 | + </g> | |
22 | + <g class="svgBg__tree svgBg__tree-4 m--right" data-id="4"> | |
23 | + <path class="svgBg__tree-leafs svgBg__tree-part" fill="#207277" d="M287,128 C310,128 295,96 287,63 C279,96 264,128 287,128" /> | |
24 | + <path class="svgBg__tree-trunk svgBg__tree-part" d="M289,148 Q288,116 287,84 Q286,116 285,147" /> | |
25 | + </g> | |
26 | + <g class="svgBg__tree svgBg__tree-5 m--right" data-id="5"> | |
27 | + <path class="svgBg__tree-leafs svgBg__tree-part" fill="#389296" d="M313,128 C336,128 321,96 313,63 C305,96 290,128 313,128" /> | |
28 | + <path class="svgBg__tree-trunk svgBg__tree-part" d="M315,148 Q314,116 313,84 Q312,116 311,147" /> | |
29 | + </g> | |
30 | + </g> | |
31 | + </svg> | |
4 | 32 | <div class="person-ifo"> |
5 | 33 | <div class="person-pic" :style="{backgroundImage:'url('+this.headPicUrl+')',backgroundSize:'100%'}"></div> |
6 | 34 | <ul class="person-con"> |
7 | - <li>昵称:{{ userPhone}}</li> | |
35 | + <li>手机号:{{ userPhone}}</li> | |
36 | + <li style="height: 20px;"></li> | |
8 | 37 | <li>账户余额: <span>¥{{(acctBalance/100).toFixed(2)}}</span></li> |
9 | - <li>我的卡券:<span>{{ couponNum }}张</span></li> | |
38 | + <!--<li>我的卡券:<span>{{ couponNum }}张</span></li>--> | |
10 | 39 | </ul> |
11 | 40 | </div> |
12 | 41 | </div> |
... | ... | @@ -20,7 +49,7 @@ |
20 | 49 | <!--<mt-cell title="建议反馈" is-link></mt-cell>--> |
21 | 50 | |
22 | 51 | <div class="leftRightPadding" style="margin-top: 34px" v-show="loginShow"> |
23 | - <mt-button type="danger" size="large" @click="loginHandle">{{ loginTxt }}</mt-button> | |
52 | + <mt-button type="primary" size="large" @click="loginHandle">{{ loginTxt }}</mt-button> | |
24 | 53 | </div> |
25 | 54 | |
26 | 55 | </div> |
... | ... | @@ -162,8 +191,9 @@ export default { |
162 | 191 | var headPicUrl = "";//头像 |
163 | 192 | var custNickname = "";//昵称 |
164 | 193 | var phone = "";//昵称 |
165 | - | |
166 | - this.queryCustPersonBaseInfo(); //获取手机号和头像 | |
194 | + this.userPhone = data.data.phone;//昵称 | |
195 | + this.loginShow = false | |
196 | + // this.queryCustPersonBaseInfo(); //获取手机号和头像 | |
167 | 197 | } else { |
168 | 198 | this.$vux.toast.text(data.message, "top"); |
169 | 199 | } |
... | ... | @@ -245,15 +275,19 @@ export default { |
245 | 275 | <style scoped lang="scss"> |
246 | 276 | .person-bg { |
247 | 277 | height: 160px; |
248 | - background: url("../../assets/images/mySelf/selfNavBg.png") no-repeat; | |
249 | - background-size: 100% 100%; | |
278 | + background: -webkit-linear-gradient(#7BCECA, #82D3CB); | |
279 | + background: linear-gradient(#7BCECA, #82D3CB); | |
280 | + | |
250 | 281 | } |
251 | 282 | |
252 | 283 | .person-ifo { |
253 | 284 | padding: $commonLeftRightPadding; |
254 | 285 | padding-top: 45px; |
255 | 286 | display: flex; |
256 | - color: #ffbfbf; | |
287 | + /*color: #ffbfbf;*/ | |
288 | + position: absolute; | |
289 | + top: 0; | |
290 | + left: 0; | |
257 | 291 | .person-pic { |
258 | 292 | width: 64px; |
259 | 293 | height: 64px; | ... | ... |