正在显示
5 个修改的文件
包含
310 行增加
和
175 行删除
@@ -12,12 +12,15 @@ | @@ -12,12 +12,15 @@ | ||
12 | 12 | ||
13 | <block v-if="current === 0"> | 13 | <block v-if="current === 0"> |
14 | <!-- 地址 --> | 14 | <!-- 地址 --> |
15 | - <view class="home"> | 15 | + <view @click="toadd" class="home"> |
16 | <image src="../../../static/address.png"></image> | 16 | <image src="../../../static/address.png"></image> |
17 | <view> | 17 | <view> |
18 | - <text>1111 444444</text> | ||
19 | - <text>2222</text> | ||
20 | - <text>3333</text> | 18 | + <text v-if="user_address_id === ''">点击选择地址</text> |
19 | + <block v-else> | ||
20 | + <text >{{user_address.consignee}} {{user_address.phone}}</text> | ||
21 | + <text>{{user_address.province_name + user_address.city_name + user_address.area_name + user_address.address}}</text> | ||
22 | + </block> | ||
23 | + | ||
21 | </view> | 24 | </view> |
22 | </view> | 25 | </view> |
23 | 26 | ||
@@ -29,10 +32,14 @@ | @@ -29,10 +32,14 @@ | ||
29 | 32 | ||
30 | <!-- 设备详情 --> | 33 | <!-- 设备详情 --> |
31 | <view class="xiangxi"> | 34 | <view class="xiangxi"> |
32 | - <image src="../../../static/background.png" mode=""></image> | ||
33 | - <text>11111111111111111111111111111111111111111111111</text> | 35 | + <image :src="equipment.quipment_image" mode=""></image> |
36 | + <text>{{equipment.equipment_name}}</text> | ||
37 | + </view> | ||
38 | + | ||
39 | + <view class="bottom-wrp"> | ||
40 | + <text @click="callPhone">联系电话: {{number || '扫描后机器后获得'}}</text> | ||
41 | + <view @click="serive">维修</view> | ||
34 | </view> | 42 | </view> |
35 | - <view @click="saoma">扫码</view> | ||
36 | </block> | 43 | </block> |
37 | 44 | ||
38 | <block v-else> | 45 | <block v-else> |
@@ -66,17 +73,87 @@ | @@ -66,17 +73,87 @@ | ||
66 | return { | 73 | return { |
67 | list:['预约安装','历史工单'], | 74 | list:['预约安装','历史工单'], |
68 | current:0, | 75 | current:0, |
69 | - his:'' | 76 | + his:'', |
77 | + equipment_id:'', | ||
78 | + user_address_id:'', | ||
79 | + user_address:'', | ||
80 | + address: { | ||
81 | + is_default: 0 | ||
82 | + }, | ||
83 | + equipment:'', | ||
84 | + page:1 | ||
70 | }; | 85 | }; |
71 | }, | 86 | }, |
87 | + onReachBottom(){ | ||
88 | + if(this.current === 1){ | ||
89 | + const data = { | ||
90 | + page:this.page + 1 | ||
91 | + } | ||
92 | + this.page = this.page + 1 | ||
93 | + request.post('api/aftersale/installList',data).then(r=>{ | ||
94 | + if(r.code == 1){ | ||
95 | + let a = r.data.data | ||
96 | + a = this.his.concat(a) | ||
97 | + this.his = a | ||
98 | + } | ||
99 | + }) | ||
100 | + } | ||
101 | + }, | ||
102 | + watch:{ | ||
103 | + address(val, oldVal) { | ||
104 | + console.log(val) | ||
105 | + this.user_address = val | ||
106 | + this.user_address_id = val.id | ||
107 | + const data = { | ||
108 | + equipment_id: this.equipment_id, | ||
109 | + user_address_id : this.user_address_id | ||
110 | + } | ||
111 | + request.post('api/aftersale/installView',data).then(r=>{ | ||
112 | + if(r.code === 1){ | ||
113 | + this.equipment = r.data.equipment | ||
114 | + } | ||
115 | + }) | ||
116 | + } | ||
117 | + }, | ||
72 | methods:{ | 118 | methods:{ |
73 | - saoma(){ | ||
74 | - this.$wxsdk.scanQRCode(res => { | ||
75 | - console.log('1') | ||
76 | - console.log(res) | ||
77 | - console.log('2') | ||
78 | - }); | ||
79 | 119 | ||
120 | + toadd(){ | ||
121 | + uni.navigateTo({ | ||
122 | + url:'/pages/user/address/list' | ||
123 | + }) | ||
124 | + }, | ||
125 | + serive(){ | ||
126 | + const data = { | ||
127 | + equipment_id:this.equipment_id, | ||
128 | + user_address_id:this.user_address_id | ||
129 | + } | ||
130 | + if(this.equipment_id !== '' && this.user_address_id !== ''){ | ||
131 | + request.post('api/aftersale/repair',data,'POST').then(r=>{ | ||
132 | + uni.showToast({ | ||
133 | + title:r.msg, | ||
134 | + icon:'none' | ||
135 | + }) | ||
136 | + }) | ||
137 | + }else{ | ||
138 | + uni.showToast({ | ||
139 | + title:'内容不能为空 请重试', | ||
140 | + icon:'none', | ||
141 | + success() { | ||
142 | + setTimeout(()=>{ | ||
143 | + uni.reLaunch({ | ||
144 | + url:'/pages/index/view?id=13' | ||
145 | + | ||
146 | + }) | ||
147 | + },500) | ||
148 | + } | ||
149 | + }) | ||
150 | + } | ||
151 | + | ||
152 | + }, | ||
153 | + callPhone(){ | ||
154 | + uni.makePhoneCall({ | ||
155 | + phoneNumber:this.number | ||
156 | + }) | ||
80 | }, | 157 | }, |
81 | toMsg(e){ | 158 | toMsg(e){ |
82 | uni.navigateTo({ | 159 | uni.navigateTo({ |
@@ -85,13 +162,7 @@ | @@ -85,13 +162,7 @@ | ||
85 | }, | 162 | }, |
86 | changeIndex(e){ | 163 | changeIndex(e){ |
87 | this.current = parseInt(e.currentTarget.dataset.index) | 164 | this.current = parseInt(e.currentTarget.dataset.index) |
88 | - if(this.current === 0){ | ||
89 | - request.post('api/aftersale/installList').then(r=>{ | ||
90 | - if(r.code == 1){ | ||
91 | - | ||
92 | - } | ||
93 | - }) | ||
94 | - }else if(this.current === 1){ | 165 | + if(this.current === 1){ |
95 | request.post('api/aftersale/installList').then(r=>{ | 166 | request.post('api/aftersale/installList').then(r=>{ |
96 | if(r.code == 1){ | 167 | if(r.code == 1){ |
97 | this.his = r.data.data | 168 | this.his = r.data.data |
@@ -100,20 +171,37 @@ | @@ -100,20 +171,37 @@ | ||
100 | } | 171 | } |
101 | } | 172 | } |
102 | }, | 173 | }, |
103 | - onLoad:function(option){ | ||
104 | - // const data = { | ||
105 | - // lower_user_id : option.id | ||
106 | - // } | ||
107 | - // request.post('api/aftersale/installView',data).then(r=>{ | ||
108 | - // if(r.code == 1){ | ||
109 | - // console.log(r) | ||
110 | - // } | ||
111 | - // }) | 174 | + onLoad:function(){ |
175 | + this.$wxsdk.scanQRCode(res => { | ||
176 | + this.equipment_id = res.resultStr | ||
177 | + }); | ||
112 | }, | 178 | }, |
113 | } | 179 | } |
114 | </script> | 180 | </script> |
115 | 181 | ||
116 | <style lang="scss" scoped> | 182 | <style lang="scss" scoped> |
183 | + .bottom-wrp{ | ||
184 | + width: 686rpx; | ||
185 | + text-align: center; | ||
186 | + position: absolute; | ||
187 | + bottom: 64rpx; | ||
188 | + // top:50%; | ||
189 | + left:50%; | ||
190 | + transform:translate(-50%, -50%); | ||
191 | + >text{ | ||
192 | + color: #576B95; | ||
193 | + text-decoration: underline; | ||
194 | + font-size: 24rpx; | ||
195 | + } | ||
196 | + >view{ | ||
197 | + margin-top: 32rpx; | ||
198 | + background: linear-gradient(135deg,#08a3e3, #0ac6d2); | ||
199 | + border-radius: 16rpx; | ||
200 | + color: white; | ||
201 | + padding-top: 24rpx; | ||
202 | + padding-bottom: 24rpx; | ||
203 | + } | ||
204 | + } | ||
117 | .all{ | 205 | .all{ |
118 | display: flex; | 206 | display: flex; |
119 | justify-content: space-around; | 207 | justify-content: space-around; |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | 12 | ||
13 | <block v-if="current === 0"> | 13 | <block v-if="current === 0"> |
14 | <!-- 地址 --> | 14 | <!-- 地址 --> |
15 | - <view class="home"> | 15 | + <view @click="toadd" class="home"> |
16 | <image src="../../../static/address.png"></image> | 16 | <image src="../../../static/address.png"></image> |
17 | <view> | 17 | <view> |
18 | <text>{{user_address.consignee}} {{user_address.phone}}</text> | 18 | <text>{{user_address.consignee}} {{user_address.phone}}</text> |
@@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
30 | <view class="xiangxi"> | 30 | <view class="xiangxi"> |
31 | <text>产品类型</text> | 31 | <text>产品类型</text> |
32 | <view> | 32 | <view> |
33 | - <picker range-key="name" :value=0 mode="selector" :range="listSelect" @change="change"> | 33 | + <picker range-key="name" mode="selector" :range="listSelect" @change="change"> |
34 | <view>{{value_ || '请选择'}}</view> | 34 | <view>{{value_ || '请选择'}}</view> |
35 | </picker> | 35 | </picker> |
36 | <image src="../../../static/back.png" mode=""></image> | 36 | <image src="../../../static/back.png" mode=""></image> |
@@ -66,10 +66,10 @@ | @@ -66,10 +66,10 @@ | ||
66 | 66 | ||
67 | <radio-group @change="getPay"> | 67 | <radio-group @change="getPay"> |
68 | <label class="lable"> | 68 | <label class="lable"> |
69 | - <radio value="1" /><view class="equipment">上门支付</view> | 69 | + <radio class="radio" value="1" /><view class="equipment">上门支付</view> |
70 | </label> | 70 | </label> |
71 | <label class="lable"> | 71 | <label class="lable"> |
72 | - <radio value="2" /><view class="equipment">立即支付</view> | 72 | + <radio class="radio" value="2" /><view class="equipment">立即支付</view> |
73 | </label> | 73 | </label> |
74 | </radio-group> | 74 | </radio-group> |
75 | 75 | ||
@@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
110 | list:['预约维修','历史工单'], | 110 | list:['预约维修','历史工单'], |
111 | current:0, | 111 | current:0, |
112 | list2:'', | 112 | list2:'', |
113 | - listSelect:['dnkmsqjodjioqw','fjiwjio'], | 113 | + listSelect:['加载中','加载中'], |
114 | value_:'', | 114 | value_:'', |
115 | user_address:'', | 115 | user_address:'', |
116 | care_package_list:'', | 116 | care_package_list:'', |
@@ -120,9 +120,20 @@ | @@ -120,9 +120,20 @@ | ||
120 | care_package_id:'', | 120 | care_package_id:'', |
121 | category_id:'', | 121 | category_id:'', |
122 | his:'', | 122 | his:'', |
123 | - page:1 | 123 | + page:1, |
124 | + address: { | ||
125 | + is_default: 0 | ||
126 | + } | ||
124 | }; | 127 | }; |
125 | }, | 128 | }, |
129 | + watch:{ | ||
130 | + address(val, oldVal) { | ||
131 | + console.log(val) | ||
132 | + this.user_address = val | ||
133 | + this.user_address_id = val.id | ||
134 | + console.log(val.id) | ||
135 | + } | ||
136 | + }, | ||
126 | onReachBottom(){ | 137 | onReachBottom(){ |
127 | if(this.current === 1){ | 138 | if(this.current === 1){ |
128 | const data = { | 139 | const data = { |
@@ -143,7 +154,8 @@ | @@ -143,7 +154,8 @@ | ||
143 | this.care_package_id = e.detail.value | 154 | this.care_package_id = e.detail.value |
144 | }, | 155 | }, |
145 | getPay(e){ | 156 | getPay(e){ |
146 | - this.paytype = e.detail.value | 157 | + let a = Number(e.detail.value) |
158 | + this.paytype = a | ||
147 | }, | 159 | }, |
148 | afterServe(){ | 160 | afterServe(){ |
149 | const data = { | 161 | const data = { |
@@ -154,7 +166,7 @@ | @@ -154,7 +166,7 @@ | ||
154 | } | 166 | } |
155 | if(this.category_id !== '' && this.care_package_id !== '' && this.user_address_id !== '' && this.paytype !== ''){ | 167 | if(this.category_id !== '' && this.care_package_id !== '' && this.user_address_id !== '' && this.paytype !== ''){ |
156 | request.post('api/aftersale/care',data,'GET').then(r=>{ | 168 | request.post('api/aftersale/care',data,'GET').then(r=>{ |
157 | - if(r.code == 1){ | 169 | + if(r.code === 1){ |
158 | if(this.paytype === '2'){ | 170 | if(this.paytype === '2'){ |
159 | uni.showToast({ | 171 | uni.showToast({ |
160 | title:'发起支付中', | 172 | title:'发起支付中', |
@@ -190,8 +202,14 @@ | @@ -190,8 +202,14 @@ | ||
190 | }) | 202 | }) |
191 | }, | 203 | }, |
192 | change(e){ | 204 | change(e){ |
193 | - this.value_ = this.listSelect[e.detail.value].name | ||
194 | - this.category_id = this.listSelect[e.detail.value].id | 205 | + let a = Number(e.detail.value) |
206 | + this.value_ = this.listSelect[a].name | ||
207 | + this.category_id = this.listSelect[a].id | ||
208 | + }, | ||
209 | + toadd(){ | ||
210 | + uni.navigateTo({ | ||
211 | + url:'/pages/user/address/list' | ||
212 | + }) | ||
195 | }, | 213 | }, |
196 | toMsg(e){ | 214 | toMsg(e){ |
197 | uni.setStorageSync('toType',3) | 215 | uni.setStorageSync('toType',3) |
@@ -221,9 +239,6 @@ | @@ -221,9 +239,6 @@ | ||
221 | } | 239 | } |
222 | }, | 240 | }, |
223 | onLoad:function(option){ | 241 | onLoad:function(option){ |
224 | - const data = { | ||
225 | - user_address_id : option.id | ||
226 | - } | ||
227 | request.post('api/aftersale/careView').then(r=>{ | 242 | request.post('api/aftersale/careView').then(r=>{ |
228 | if(r.code === 1){ | 243 | if(r.code === 1){ |
229 | this.user_address = r.data.user_address | 244 | this.user_address = r.data.user_address |
@@ -233,7 +248,6 @@ | @@ -233,7 +248,6 @@ | ||
233 | this.user_address_id = r.data.user_address.id | 248 | this.user_address_id = r.data.user_address.id |
234 | } | 249 | } |
235 | }) | 250 | }) |
236 | - this.init(); | ||
237 | }, | 251 | }, |
238 | } | 252 | } |
239 | </script> | 253 | </script> |
@@ -245,10 +259,9 @@ | @@ -245,10 +259,9 @@ | ||
245 | align-items: center; | 259 | align-items: center; |
246 | margin: 0 auto; | 260 | margin: 0 auto; |
247 | margin-left: 32rpx; | 261 | margin-left: 32rpx; |
248 | - // radio{ | ||
249 | - // width: 32rpx; | ||
250 | - // height: 32rpx; | ||
251 | - // } | 262 | + .radio{ |
263 | + transform: scale(0.6); | ||
264 | + } | ||
252 | } | 265 | } |
253 | .dol::before{ | 266 | .dol::before{ |
254 | content: '¥'; | 267 | content: '¥'; |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | 12 | ||
13 | <block v-if="current === 0"> | 13 | <block v-if="current === 0"> |
14 | <!-- 地址 --> | 14 | <!-- 地址 --> |
15 | - <view class="home"> | 15 | + <view @click="toadd" class="home"> |
16 | <image src="../../../static/address.png"></image> | 16 | <image src="../../../static/address.png"></image> |
17 | <view> | 17 | <view> |
18 | <text>{{user_address.consignee}} {{user_address.phone}}</text> | 18 | <text>{{user_address.consignee}} {{user_address.phone}}</text> |
@@ -83,9 +83,20 @@ | @@ -83,9 +83,20 @@ | ||
83 | category_id:'', | 83 | category_id:'', |
84 | user_address_id:'', | 84 | user_address_id:'', |
85 | his:'', | 85 | his:'', |
86 | - page:1 | 86 | + page:1, |
87 | + address: { | ||
88 | + is_default: 0 | ||
89 | + } | ||
87 | }; | 90 | }; |
88 | }, | 91 | }, |
92 | + watch:{ | ||
93 | + address(val, oldVal) { | ||
94 | + console.log(val) | ||
95 | + this.user_address = val | ||
96 | + this.user_address_id = val.id | ||
97 | + console.log(val.id) | ||
98 | + } | ||
99 | + }, | ||
89 | onReachBottom(){ | 100 | onReachBottom(){ |
90 | if(this.current === 1){ | 101 | if(this.current === 1){ |
91 | const data = { | 102 | const data = { |
@@ -102,6 +113,17 @@ | @@ -102,6 +113,17 @@ | ||
102 | } | 113 | } |
103 | }, | 114 | }, |
104 | methods:{ | 115 | methods:{ |
116 | + jump(path, parmas) { | ||
117 | + this.$Router.push({ | ||
118 | + path: path, | ||
119 | + query: parmas | ||
120 | + }); | ||
121 | + }, | ||
122 | + toadd(){ | ||
123 | + uni.navigateTo({ | ||
124 | + url:'/pages/user/address/list' | ||
125 | + }) | ||
126 | + }, | ||
105 | callPhone(){ | 127 | callPhone(){ |
106 | uni.makePhoneCall({ | 128 | uni.makePhoneCall({ |
107 | phoneNumber:this.number | 129 | phoneNumber:this.number |
@@ -120,7 +142,6 @@ | @@ -120,7 +142,6 @@ | ||
120 | }) | 142 | }) |
121 | }) | 143 | }) |
122 | }else{ | 144 | }else{ |
123 | - console.log(data) | ||
124 | uni.showToast({ | 145 | uni.showToast({ |
125 | title:'请先补全信息', | 146 | title:'请先补全信息', |
126 | icon:'none' | 147 | icon:'none' |
@@ -143,7 +164,6 @@ | @@ -143,7 +164,6 @@ | ||
143 | if(this.current === 0){ | 164 | if(this.current === 0){ |
144 | request.post('api/aftersale/installList').then(r=>{ | 165 | request.post('api/aftersale/installList').then(r=>{ |
145 | if(r.code == 1){ | 166 | if(r.code == 1){ |
146 | - console.log(r) | ||
147 | this.list2 = r.data.data | 167 | this.list2 = r.data.data |
148 | } | 168 | } |
149 | }) | 169 | }) |
@@ -151,19 +171,14 @@ | @@ -151,19 +171,14 @@ | ||
151 | request.post('api/aftersale/repairList').then(r=>{ | 171 | request.post('api/aftersale/repairList').then(r=>{ |
152 | if(r.code == 1){ | 172 | if(r.code == 1){ |
153 | this.his = r.data.data | 173 | this.his = r.data.data |
154 | - console.log(r) | ||
155 | } | 174 | } |
156 | }) | 175 | }) |
157 | } | 176 | } |
158 | } | 177 | } |
159 | }, | 178 | }, |
160 | onLoad:function(option){ | 179 | onLoad:function(option){ |
161 | - const data = { | ||
162 | - user_address_id : option.id | ||
163 | - } | ||
164 | request.post('api/aftersale/repairView').then(r=>{ | 180 | request.post('api/aftersale/repairView').then(r=>{ |
165 | if(r.code === 1){ | 181 | if(r.code === 1){ |
166 | - console.log(r) | ||
167 | this.number = r.time | 182 | this.number = r.time |
168 | this.user_address = r.data.user_address | 183 | this.user_address = r.data.user_address |
169 | this.listSelect = r.data.category_list | 184 | this.listSelect = r.data.category_list |
@@ -21,6 +21,7 @@ | @@ -21,6 +21,7 @@ | ||
21 | <shopro-tabbar></shopro-tabbar> | 21 | <shopro-tabbar></shopro-tabbar> |
22 | <!-- 登录提示 --> | 22 | <!-- 登录提示 --> |
23 | <shopro-login-modal></shopro-login-modal> | 23 | <shopro-login-modal></shopro-login-modal> |
24 | + | ||
24 | </view> | 25 | </view> |
25 | </template> | 26 | </template> |
26 | 27 | ||
@@ -100,6 +101,18 @@ export default { | @@ -100,6 +101,18 @@ export default { | ||
100 | } | 101 | } |
101 | }, | 102 | }, |
102 | onLoad(option) { | 103 | onLoad(option) { |
104 | + uni.getStorage({ | ||
105 | + key:'token', | ||
106 | + fail() { | ||
107 | + uni.showToast({ | ||
108 | + title:'请先登录', | ||
109 | + icon:'none' | ||
110 | + }) | ||
111 | + uni.reLaunch({ | ||
112 | + url:'/pages/index/user' | ||
113 | + }) | ||
114 | + } | ||
115 | + }) | ||
103 | this.viewId = this.$Route.query.id; | 116 | this.viewId = this.$Route.query.id; |
104 | }, | 117 | }, |
105 | onShow() { | 118 | onShow() { |
1 | <template> | 1 | <template> |
2 | <view class="container"> | 2 | <view class="container"> |
3 | <!-- 背景图 --> | 3 | <!-- 背景图 --> |
4 | - <view class="x-c"><image class="logo-bg" src="http://shopro.7wpp.com/imgs/logo_bg.png" mode=""></image></view> | 4 | + <view class="x-c"> |
5 | + <image class="logo-bg" src="http://shopro.7wpp.com/imgs/logo_bg.png" mode=""></image> | ||
6 | + </view> | ||
5 | <!-- titleview --> | 7 | <!-- titleview --> |
6 | - <view class="head-box"><cu-custom :isBack="true"></cu-custom></view> | 8 | + <view class="head-box"> |
9 | + <cu-custom :isBack="true"></cu-custom> | ||
10 | + </view> | ||
7 | <view class="wrapper"> | 11 | <view class="wrapper"> |
8 | <!-- logo --> | 12 | <!-- logo --> |
9 | - <view class="x-c"><image class="logo" :src="sysInfo.logo" mode="widthFix"></image></view> | ||
10 | - <!-- 登录tab --> | ||
11 | - <view class="tab-box x-f"> | ||
12 | - <view class="tab-item x-c" @tap="onLoginWay(0)"> | ||
13 | - <text class="tab-title">手机登录</text> | ||
14 | - <view class="line-box" v-show="loginWay === 0"><text class="triangle"></text></view> | ||
15 | - </view> | ||
16 | - <view class="tab-item x-c" @tap="onLoginWay(1)"> | ||
17 | - <text class="tab-title">密码登录</text> | ||
18 | - <view class="line-box" password v-show="loginWay === 1"><text class="triangle"></text></view> | ||
19 | - </view> | ||
20 | - </view> | ||
21 | - <!-- 表单 --> | ||
22 | - <view class="login-box y-f" v-show="loginWay === 0"> | ||
23 | - <view class="input-item x-c"><input class="inp" v-model="userPhone" type="number" placeholder="请输入手机号" placeholder-class="pl" /></view> | ||
24 | - <view class="input-item x-c"> | ||
25 | - <input class="inp" v-model="code.value" type="number" placeholder="请输入验证码" placeholder-class="pl" /> | ||
26 | - <button class="cu-btn code-btn" :disabled="code.status" @tap="getCode">{{ code.text }}</button> | ||
27 | - </view> | ||
28 | - </view> | ||
29 | - <view class="login-box y-f" v-show="loginWay === 1"> | ||
30 | - <view class="input-item x-c"><input class="inp" v-model="userPhone" type="number" placeholder="请输入账号" placeholder-class="pl" /></view> | ||
31 | - <view class="input-item x-c"><input class="inp" password v-model="userPassword" type="text" placeholder="请输入密码" placeholder-class="pl" /></view> | ||
32 | - </view> | ||
33 | - <!-- 登录按钮 --> | ||
34 | - <view class="x-c y-f"> | ||
35 | - <button class="cu-btn login-btn mb30" @tap="toLogin">登录</button> | ||
36 | - <view class="x-bc tip-box "> | ||
37 | - <button class="cu-btn tip-btn" @tap="jump('/pages/public/register')">立即注册</button> | ||
38 | - <view class="" v-show="loginWay === 1"><button class="cu-btn tip-btn" @tap="jump('/pages/public/forgot')">忘记密码</button></view> | ||
39 | - </view> | 13 | + <view class="x-c"> |
14 | + <image class="logo" :src="sysInfo.logo" mode="widthFix"></image> | ||
40 | </view> | 15 | </view> |
16 | + <!-- 登录tab --> | ||
17 | + | ||
18 | + <!-- --> | ||
41 | <view class="third-party y-f"> | 19 | <view class="third-party y-f"> |
42 | <!-- #ifdef H5 --> | 20 | <!-- #ifdef H5 --> |
43 | <button class="cu-btn wx-logo-box y-f" @tap="wxLogin"> | 21 | <button class="cu-btn wx-logo-box y-f" @tap="wxLogin"> |
@@ -63,10 +41,14 @@ | @@ -63,10 +41,14 @@ | ||
63 | </template> | 41 | </template> |
64 | 42 | ||
65 | <script> | 43 | <script> |
66 | -import Wechat from '@/common/wechat/wechat'; | ||
67 | -import { mapMutations, mapActions, mapState } from 'vuex'; | ||
68 | -import store from '@/common/store'; | ||
69 | -export default { | 44 | + import Wechat from '@/common/wechat/wechat'; |
45 | + import { | ||
46 | + mapMutations, | ||
47 | + mapActions, | ||
48 | + mapState | ||
49 | + } from 'vuex'; | ||
50 | + import store from '@/common/store'; | ||
51 | + export default { | ||
70 | data() { | 52 | data() { |
71 | return { | 53 | return { |
72 | code: { | 54 | code: { |
@@ -85,9 +67,24 @@ export default { | @@ -85,9 +67,24 @@ export default { | ||
85 | initData: state => state.init.initData | 67 | initData: state => state.init.initData |
86 | }) | 68 | }) |
87 | }, | 69 | }, |
88 | - onLoad() { | 70 | + onLoad(e) { |
89 | if (this.$Route.query.token) { | 71 | if (this.$Route.query.token) { |
90 | this.setTokenAndBack(this.$Route.query.token); | 72 | this.setTokenAndBack(this.$Route.query.token); |
73 | + }else{ | ||
74 | + console.log(e.user_id !== undefined) | ||
75 | + if(e.user_id !== undefined){ | ||
76 | + }else{ | ||
77 | + uni.getStorage({ | ||
78 | + key:'share_id', | ||
79 | + success:function(res){ | ||
80 | + uni.reLaunch({ | ||
81 | + url:'/pages/public/login?user_id='+res.data | ||
82 | + }) | ||
83 | + console.log('运行结束') | ||
84 | + } | ||
85 | + }) | ||
86 | + } | ||
87 | + | ||
91 | } | 88 | } |
92 | }, | 89 | }, |
93 | onShow() {}, | 90 | onShow() {}, |
@@ -107,6 +104,7 @@ export default { | @@ -107,6 +104,7 @@ export default { | ||
107 | if (token !== undefined) { | 104 | if (token !== undefined) { |
108 | this.setTokenAndBack(token); | 105 | this.setTokenAndBack(token); |
109 | } | 106 | } |
107 | + console.log(token) | ||
110 | }, | 108 | }, |
111 | onLoginWay(flag) { | 109 | onLoginWay(flag) { |
112 | this.loginWay = flag; | 110 | this.loginWay = flag; |
@@ -170,11 +168,11 @@ export default { | @@ -170,11 +168,11 @@ export default { | ||
170 | }); | 168 | }); |
171 | } | 169 | } |
172 | } | 170 | } |
173 | -}; | 171 | + }; |
174 | </script> | 172 | </script> |
175 | 173 | ||
176 | <style lang="scss"> | 174 | <style lang="scss"> |
177 | -.container { | 175 | + .container { |
178 | position: relative; | 176 | position: relative; |
179 | width: 100vw; | 177 | width: 100vw; |
180 | height: 100vh; | 178 | height: 100vh; |
@@ -199,9 +197,9 @@ export default { | @@ -199,9 +197,9 @@ export default { | ||
199 | width: 640rpx; | 197 | width: 640rpx; |
200 | height: 300rpx; | 198 | height: 300rpx; |
201 | } | 199 | } |
202 | -} | 200 | + } |
203 | 201 | ||
204 | -.wrapper { | 202 | + .wrapper { |
205 | position: absolute; | 203 | position: absolute; |
206 | z-index: 90; | 204 | z-index: 90; |
207 | padding-bottom: 40upx; | 205 | padding-bottom: 40upx; |
@@ -211,97 +209,103 @@ export default { | @@ -211,97 +209,103 @@ export default { | ||
211 | top: 0; | 209 | top: 0; |
212 | 210 | ||
213 | // 登录选项卡 | 211 | // 登录选项卡 |
214 | - .tab-box { | ||
215 | - margin: 60rpx auto 30rpx; | ||
216 | - width: 608rpx; | 212 | + // .tab-box { |
213 | + // margin: 60rpx auto 30rpx; | ||
214 | + // width: 608rpx; | ||
217 | 215 | ||
218 | - .tab-item { | ||
219 | - flex: 1; | ||
220 | - height: 80rpx; | ||
221 | - position: relative; | 216 | + // .tab-item { |
217 | + // flex: 1; | ||
218 | + // height: 80rpx; | ||
219 | + // position: relative; | ||
222 | 220 | ||
223 | - .tab-title { | ||
224 | - font-size: 32rpx; | ||
225 | - font-weight: bold; | ||
226 | - color: #845708; | ||
227 | - } | 221 | + // .tab-title { |
222 | + // font-size: 32rpx; | ||
223 | + // font-weight: bold; | ||
224 | + // color: #845708; | ||
225 | + // } | ||
228 | 226 | ||
229 | - .line-box { | ||
230 | - position: absolute; | ||
231 | - width: 300rpx; | ||
232 | - height: 4rpx; | ||
233 | - background: rgba(233, 181, 98, 1); | ||
234 | - bottom: 0; | ||
235 | - left: 50%; | ||
236 | - transform: translateX(-50%); | 227 | + // .line-box { |
228 | + // position: absolute; | ||
229 | + // width: 300rpx; | ||
230 | + // height: 4rpx; | ||
231 | + // background: rgba(233, 181, 98, 1); | ||
232 | + // bottom: 0; | ||
233 | + // left: 50%; | ||
234 | + // transform: translateX(-50%); | ||
237 | 235 | ||
238 | - .triangle { | ||
239 | - position: absolute; | ||
240 | - bottom: 0; | ||
241 | - left: 50%; | ||
242 | - transform: translateX(-50%); | ||
243 | - disply: block; | ||
244 | - width: 0; | ||
245 | - height: 0; | ||
246 | - border-width: 10rpx; | ||
247 | - border-style: solid; | ||
248 | - border-color: transparent transparent #e9b562 transparent; | ||
249 | - } | ||
250 | - } | ||
251 | - } | ||
252 | - } | 236 | + // .triangle { |
237 | + // position: absolute; | ||
238 | + // bottom: 0; | ||
239 | + // left: 50%; | ||
240 | + // transform: translateX(-50%); | ||
241 | + // disply: block; | ||
242 | + // width: 0; | ||
243 | + // height: 0; | ||
244 | + // border-width: 10rpx; | ||
245 | + // border-style: solid; | ||
246 | + // border-color: transparent transparent #e9b562 transparent; | ||
247 | + // } | ||
248 | + // } | ||
249 | + // } | ||
250 | + // } | ||
253 | 251 | ||
254 | // 输入 | 252 | // 输入 |
255 | - .login-box { | ||
256 | - .input-item { | ||
257 | - height: 108rpx; | ||
258 | - border-bottom: 1rpx solid rgba(#d0b17b, 0.3); | ||
259 | - width: 608rpx; | 253 | + // .login-box { |
254 | + // .input-item { | ||
255 | + // height: 108rpx; | ||
256 | + // border-bottom: 1rpx solid rgba(#d0b17b, 0.3); | ||
257 | + // width: 608rpx; | ||
260 | 258 | ||
261 | - .inp { | ||
262 | - flex: 1; | ||
263 | - height: 100%; | ||
264 | - font-size: 28rpx; | ||
265 | - } | 259 | + // .inp { |
260 | + // flex: 1; | ||
261 | + // height: 100%; | ||
262 | + // font-size: 28rpx; | ||
263 | + // } | ||
266 | 264 | ||
267 | - .pl { | ||
268 | - color: #c8963d; | ||
269 | - } | 265 | + // .pl { |
266 | + // color: #c8963d; | ||
267 | + // } | ||
270 | 268 | ||
271 | - .code-btn { | ||
272 | - background: none; | ||
273 | - font-size: 28rpx; | ||
274 | - color: #845708; | ||
275 | - } | ||
276 | - } | ||
277 | - } | 269 | + // .code-btn { |
270 | + // background: none; | ||
271 | + // font-size: 28rpx; | ||
272 | + // color: #845708; | ||
273 | + // } | ||
274 | + // } | ||
275 | + // } | ||
278 | 276 | ||
279 | // 登录 | 277 | // 登录 |
280 | - .login-btn { | ||
281 | - width: 630upx; | ||
282 | - height: 80upx; | ||
283 | - border-radius: 40rpx; | ||
284 | - margin-top: 70upx; | ||
285 | - background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); | ||
286 | - box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); | ||
287 | - color: #fff; | ||
288 | - } | 278 | + // .login-btn { |
279 | + // width: 630upx; | ||
280 | + // height: 80upx; | ||
281 | + // border-radius: 40rpx; | ||
282 | + // margin-top: 70upx; | ||
283 | + // background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1)); | ||
284 | + // box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22); | ||
285 | + // color: #fff; | ||
286 | + // } | ||
289 | 287 | ||
290 | - .tip-box { | ||
291 | - width: 630rpx; | 288 | + // .tip-box { |
289 | + // width: 630rpx; | ||
292 | 290 | ||
293 | - .tip-btn { | ||
294 | - font-size: 26rpx; | ||
295 | - font-family: PingFang SC; | ||
296 | - font-weight: 400; | ||
297 | - text-decoration: underline; | ||
298 | - color: rgba(200, 150, 61, 1); | ||
299 | - background: none; | ||
300 | - } | ||
301 | - } | 291 | + // .tip-btn { |
292 | + // font-size: 26rpx; | ||
293 | + // font-family: PingFang SC; | ||
294 | + // font-weight: 400; | ||
295 | + // text-decoration: underline; | ||
296 | + // color: rgba(200, 150, 61, 1); | ||
297 | + // background: none; | ||
298 | + // } | ||
299 | + // } | ||
302 | 300 | ||
303 | // 一键登录按钮 | 301 | // 一键登录按钮 |
304 | .wx-logo-box { | 302 | .wx-logo-box { |
303 | + | ||
304 | + position: absolute; | ||
305 | + left: 50%; | ||
306 | + top: 50%; | ||
307 | + transform: translate(-50%,-50%); | ||
308 | + | ||
305 | font-size: 26rpx; | 309 | font-size: 26rpx; |
306 | font-family: PingFang SC; | 310 | font-family: PingFang SC; |
307 | font-weight: 400; | 311 | font-weight: 400; |
@@ -309,9 +313,11 @@ export default { | @@ -309,9 +313,11 @@ export default { | ||
309 | margin-top: 80rpx; | 313 | margin-top: 80rpx; |
310 | background: none; | 314 | background: none; |
311 | display: block; | 315 | display: block; |
316 | + | ||
312 | &:hover { | 317 | &:hover { |
313 | background: none; | 318 | background: none; |
314 | } | 319 | } |
320 | + | ||
315 | .auto-login { | 321 | .auto-login { |
316 | width: 80rpx; | 322 | width: 80rpx; |
317 | height: 80rpx; | 323 | height: 80rpx; |
@@ -319,5 +325,5 @@ export default { | @@ -319,5 +325,5 @@ export default { | ||
319 | margin-bottom: 10rpx; | 325 | margin-bottom: 10rpx; |
320 | } | 326 | } |
321 | } | 327 | } |
322 | -} | 328 | + } |
323 | </style> | 329 | </style> |
-
请 注册 或 登录 后发表评论