Merged
Merge Request #310 · created by 后端研发-苏明海


Qa


From qa into master

Merged by 后端研发-苏明海

1 participants


app.json
@@ -13,32 +13,24 @@ @@ -13,32 +13,24 @@
13 "pages/user/index/index", 13 "pages/user/index/index",
14 "pages/user/order_list/order_list", 14 "pages/user/order_list/order_list",
15 "pages/user/order_detail/order_detail", 15 "pages/user/order_detail/order_detail",
16 - "pages/user/visit_log/visit_log",  
17 "pages/user/address_list/address_list", 16 "pages/user/address_list/address_list",
18 "pages/user/userinfo/userinfo", 17 "pages/user/userinfo/userinfo",
19 "pages/user/return_goods_list/return_goods_list", 18 "pages/user/return_goods_list/return_goods_list",
20 - "pages/user/userinfo_edit/userinfo_edit",  
21 - "pages/user/collect_list/collect_list",  
22 "pages/user/coupon/coupon", 19 "pages/user/coupon/coupon",
23 "pages/user/checkcoupon/checkcoupon", 20 "pages/user/checkcoupon/checkcoupon",
24 "pages/user/add_address/add_address", 21 "pages/user/add_address/add_address",
25 - "pages/user/account_list/account_list",  
26 - "pages/user/points_list/points_list",  
27 - "pages/user/recharge_list/recharge_list",  
28 "pages/user/withdrawals_list/withdrawals_list", 22 "pages/user/withdrawals_list/withdrawals_list",
29 "pages/user/add_comment/add_comment", 23 "pages/user/add_comment/add_comment",
30 "pages/user/return_goods_info/return_goods_info", 24 "pages/user/return_goods_info/return_goods_info",
31 "pages/user/return_goods/return_goods", 25 "pages/user/return_goods/return_goods",
32 "pages/user/withdrawals/withdrawals", 26 "pages/user/withdrawals/withdrawals",
33 "pages/user/recharge/recharge", 27 "pages/user/recharge/recharge",
34 - "pages/user/message_notice/message_notice",  
35 "pages/user/express/express", 28 "pages/user/express/express",
36 "pages/user/binding_info/binding_info", 29 "pages/user/binding_info/binding_info",
37 "pages/user/get_user_info/get_user_info", 30 "pages/user/get_user_info/get_user_info",
38 "pages/activity/seckill_list/seckill_list", 31 "pages/activity/seckill_list/seckill_list",
39 "pages/activity/pind_list/pind_list", 32 "pages/activity/pind_list/pind_list",
40 "pages/togoin/togoin", 33 "pages/togoin/togoin",
41 - "pages/getphone/getphone",  
42 "pages/team/team_success/team_success", 34 "pages/team/team_success/team_success",
43 "pages/team/team_show/team_show", 35 "pages/team/team_show/team_show",
44 "pages/team/team_ping/team_ping", 36 "pages/team/team_ping/team_ping",
@@ -66,36 +58,40 @@ @@ -66,36 +58,40 @@
66 "pages/user/plus/plus", 58 "pages/user/plus/plus",
67 "pages/user/cardinfo/cardinfo", 59 "pages/user/cardinfo/cardinfo",
68 "pages/user/Detailed/Detailed", 60 "pages/user/Detailed/Detailed",
69 - "pages/user/Change_phone/Change_phone",  
70 - "pages/user/my_service/appment_main",  
71 - "pages/user/my_service/i_service",  
72 - "pages/user/my_service/cosmetology_list",  
73 - "pages/user/my_service/hist_service",  
74 - "pages/user/my_service/tment_details",  
75 - "pages/user/my_service/tment_eval",  
76 - "pages/user/my_service/tment_order_list",  
77 - "pages/user/my_service/beauty_deta",  
78 - "pages/user/labels/labels",  
79 -  
80 - "pages/user/view_comment/view_comment",  
81 - "pages/giftpack/birthdaygift/birthdaygift",  
82 - "pages/user/comment/comment",  
83 - "pages/giftpack/evaluategift/evaluategift",  
84 - "pages/giftpack/newvipgift/newvipgift",  
85 - "pages/giftpack/payment/payment",  
86 - "pages/giftpack/buygiftpack/giftpackbuy",  
87 - "pages/giftpack/giftpacklist/giftpacklist",  
88 - "pages/giftpack/mygiftpack/mygiftpack",  
89 -  
90 - "pages/user/assistance/giftpacklist",  
91 - "pages/user/assistance/task_assistance",  
92 - "pages/user/assistance/friend_assistance",  
93 - "pages/user/assistance/assistance_success",  
94 - "pages/user/assistance/assistance",  
95 -  
96 - "pages/test/zhuli_test" 61 + "pages/user/Change_phone/Change_phone"
  62 +
97 63
98 ], 64 ],
  65 + "SubPackages":[
  66 + {
  67 + "root":"packageA",
  68 + "pages":[
  69 + "pages/user/my_service/appment_main",
  70 + "pages/user/my_service/i_service",
  71 + "pages/user/my_service/cosmetology_list",
  72 + "pages/user/my_service/hist_service",
  73 + "pages/user/my_service/tment_details",
  74 + "pages/user/my_service/tment_eval",
  75 + "pages/user/my_service/tment_order_list",
  76 + "pages/user/my_service/beauty_deta",
  77 + "pages/user/labels/labels",
  78 + "pages/user/view_comment/view_comment",
  79 + "pages/giftpack/birthdaygift/birthdaygift",
  80 + "pages/user/comment/comment",
  81 + "pages/giftpack/evaluategift/evaluategift",
  82 + "pages/giftpack/newvipgift/newvipgift",
  83 + "pages/giftpack/payment/payment",
  84 + "pages/giftpack/buygiftpack/giftpackbuy",
  85 + "pages/giftpack/giftpacklist/giftpacklist",
  86 + "pages/giftpack/mygiftpack/mygiftpack",
  87 + "pages/user/assistance/giftpacklist",
  88 + "pages/user/assistance/task_assistance",
  89 + "pages/user/assistance/friend_assistance",
  90 + "pages/user/assistance/assistance_success",
  91 + "pages/user/assistance/assistance"
  92 + ]
  93 + }
  94 + ],
99 "permission": { 95 "permission": {
100 "scope.userLocation": { 96 "scope.userLocation": {
101 "desc": "获取你的位置信息" 97 "desc": "获取你的位置信息"
components/diy_advertising/diy_advertising.wxml
1 -<!--pages/diy_gk/diy_gk.wxml--> 1 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
2 <!--上下两块--> 2 <!--上下两块-->
3 <block wx:if='{{object.style==0}}'> 3 <block wx:if='{{object.style==0}}'>
4 <view class="zwp_s1"> 4 <view class="zwp_s1">
@@ -9,10 +9,13 @@ @@ -9,10 +9,13 @@
9 <text>建议宽度640</text> 9 <text>建议宽度640</text>
10 </block> 10 </block>
11 <block wx:if="{{item.src!=''}}"> 11 <block wx:if="{{item.src!=''}}">
12 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
13 - <image src="{{item.src}}" mode="widthFix">  
14 - </image>  
15 - </view> 12 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"
  13 + wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  14 + <image src="{{item.src}}" mode="widthFix"></image>
  15 + </navigator>
  16 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  17 + <image src="{{item.src}}" mode="widthFix"></image>
  18 + </view>
16 </block> 19 </block>
17 </view> 20 </view>
18 21
@@ -31,10 +34,14 @@ @@ -31,10 +34,14 @@
31 <text>建议宽度640</text> 34 <text>建议宽度640</text>
32 </block> 35 </block>
33 <block wx:if="{{item.src!=''}}"> 36 <block wx:if="{{item.src!=''}}">
34 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
35 - <image src="{{item.src}}" mode="widthFix">  
36 - </image> 37 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  38 + <image src="{{item.src}}" mode="widthFix"></image>
  39 + </navigator>
  40 +
  41 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  42 + <image src="{{item.src}}" mode="widthFix"></image>
37 </view> 43 </view>
  44 +
38 </block> 45 </block>
39 46
40 </view> 47 </view>
@@ -55,9 +62,15 @@ @@ -55,9 +62,15 @@
55 <text>300*300</text> 62 <text>300*300</text>
56 </block> 63 </block>
57 <block wx:if="{{item.src!=''}}"> 64 <block wx:if="{{item.src!=''}}">
58 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 65 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  66 + <image src="{{item.src}}" mode="widthFix"></image>
  67 + </navigator>
  68 +
  69 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
59 <image src="{{item.src}}" mode="widthFix"></image> 70 <image src="{{item.src}}" mode="widthFix"></image>
60 </view> 71 </view>
  72 +
  73 +
61 </block> 74 </block>
62 </view> 75 </view>
63 </view> 76 </view>
@@ -76,9 +89,8 @@ @@ -76,9 +89,8 @@
76 <text>200*200</text> 89 <text>200*200</text>
77 </block> 90 </block>
78 <block wx:if="{{item.src!=''}}"> 91 <block wx:if="{{item.src!=''}}">
79 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
80 - <image src="{{item.src}}" ></image>  
81 - </view> 92 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" ></image></navigator>
  93 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" ></image></view>
82 </block> 94 </block>
83 </view> 95 </view>
84 </block> 96 </block>
@@ -86,7 +98,6 @@ @@ -86,7 +98,6 @@
86 <view class="clear"></view> 98 <view class="clear"></view>
87 99
88 100
89 -  
90 <!--第5 3个图 --> 101 <!--第5 3个图 -->
91 <view class='s5' wx:if='{{object.style==5}}'> 102 <view class='s5' wx:if='{{object.style==5}}'>
92 103
@@ -95,7 +106,10 @@ @@ -95,7 +106,10 @@
95 <text>300*300</text> 106 <text>300*300</text>
96 </block> 107 </block>
97 <block wx:if="{{object.data[0].src!=''}}"> 108 <block wx:if="{{object.data[0].src!=''}}">
98 - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 109 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">>
  110 + <image src="{{object.data[0].src}}"></image>
  111 + </navigator>
  112 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
99 <image src="{{object.data[0].src}}"></image> 113 <image src="{{object.data[0].src}}"></image>
100 </view> 114 </view>
101 </block> 115 </block>
@@ -107,9 +121,15 @@ @@ -107,9 +121,15 @@
107 <text>300*150</text> 121 <text>300*150</text>
108 </block> 122 </block>
109 <block wx:if="{{object.data[1].src!=''}}"> 123 <block wx:if="{{object.data[1].src!=''}}">
110 - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 124 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  125 + <image src="{{object.data[1].src}}"></image>
  126 + </navigator>
  127 +
  128 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
111 <image src="{{object.data[1].src}}"></image> 129 <image src="{{object.data[1].src}}"></image>
112 </view> 130 </view>
  131 +
  132 +
113 </block> 133 </block>
114 </view> 134 </view>
115 <view class='s5_g5_2'> 135 <view class='s5_g5_2'>
@@ -117,9 +137,14 @@ @@ -117,9 +137,14 @@
117 <text>300*150</text> 137 <text>300*150</text>
118 </block> 138 </block>
119 <block wx:if="{{object.data[2].src!=''}}"> 139 <block wx:if="{{object.data[2].src!=''}}">
120 - <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url"> 140 + <navigator url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  141 + <image src="{{object.data[2].src}}"></image>
  142 + </navigator>
  143 + <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url" wx:else>
121 <image src="{{object.data[2].src}}"></image> 144 <image src="{{object.data[2].src}}"></image>
122 </view> 145 </view>
  146 +
  147 +
123 </block> 148 </block>
124 </view> 149 </view>
125 </view> 150 </view>
@@ -134,9 +159,14 @@ @@ -134,9 +159,14 @@
134 <text>200*200</text> 159 <text>200*200</text>
135 </block> 160 </block>
136 <block wx:if="{{object.data[0].src!=''}}"> 161 <block wx:if="{{object.data[0].src!=''}}">
137 - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 162 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  163 + <image src="{{object.data[0].src}}"></image>
  164 + </navigator>
  165 +
  166 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
138 <image src="{{object.data[0].src}}"></image> 167 <image src="{{object.data[0].src}}"></image>
139 </view> 168 </view>
  169 +
140 </block> 170 </block>
141 </view> 171 </view>
142 <view class='s6_gk6_2' style='margin-right:8rpx'> 172 <view class='s6_gk6_2' style='margin-right:8rpx'>
@@ -144,9 +174,14 @@ @@ -144,9 +174,14 @@
144 <text>400*200</text> 174 <text>400*200</text>
145 </block> 175 </block>
146 <block wx:if="{{object.data[1].src!=''}}"> 176 <block wx:if="{{object.data[1].src!=''}}">
147 - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 177 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  178 + <image src="{{object.data[1].src}}"></image>
  179 + </navigator>
  180 +
  181 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
148 <image src="{{object.data[1].src}}"></image> 182 <image src="{{object.data[1].src}}"></image>
149 </view> 183 </view>
  184 +
150 </block> 185 </block>
151 </view> 186 </view>
152 </view> 187 </view>
@@ -157,9 +192,14 @@ @@ -157,9 +192,14 @@
157 <text>400*200</text> 192 <text>400*200</text>
158 </block> 193 </block>
159 <block wx:if="{{object.data[2].src!=''}}"> 194 <block wx:if="{{object.data[2].src!=''}}">
160 - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 195 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  196 + <image src="{{object.data[2].src}}"></image>
  197 + </navigator>
  198 +
  199 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
161 <image src="{{object.data[2].src}}"></image> 200 <image src="{{object.data[2].src}}"></image>
162 </view> 201 </view>
  202 +
163 </block> 203 </block>
164 </view> 204 </view>
165 <view class='s6_gk6_1' style='margin-right:8rpx'> 205 <view class='s6_gk6_1' style='margin-right:8rpx'>
@@ -167,9 +207,14 @@ @@ -167,9 +207,14 @@
167 <text>200*200</text> 207 <text>200*200</text>
168 </block> 208 </block>
169 <block wx:if="{{object.data[3].src!=''}}"> 209 <block wx:if="{{object.data[3].src!=''}}">
170 - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 210 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  211 + <image src="{{object.data[3].src}}"></image>
  212 + </navigator>
  213 +
  214 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
171 <image src="{{object.data[3].src}}"></image> 215 <image src="{{object.data[3].src}}"></image>
172 </view> 216 </view>
  217 +
173 </block> 218 </block>
174 </view> 219 </view>
175 </view> 220 </view>
@@ -184,9 +229,14 @@ @@ -184,9 +229,14 @@
184 <text>300*150</text> 229 <text>300*150</text>
185 </block> 230 </block>
186 <block wx:if="{{object.data[0].src!=''}}"> 231 <block wx:if="{{object.data[0].src!=''}}">
187 - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 232 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  233 + <image src="{{object.data[0].src}}"></image>
  234 + </navigator>
  235 +
  236 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
188 <image src="{{object.data[0].src}}"></image> 237 <image src="{{object.data[0].src}}"></image>
189 </view> 238 </view>
  239 +
190 </block> 240 </block>
191 </view> 241 </view>
192 <view class='s7_gk7_2'> 242 <view class='s7_gk7_2'>
@@ -195,9 +245,13 @@ @@ -195,9 +245,13 @@
195 <text>300*300</text> 245 <text>300*300</text>
196 </block> 246 </block>
197 <block wx:if="{{object.data[1].src!=''}}"> 247 <block wx:if="{{object.data[1].src!=''}}">
198 - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url"> 248 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  249 + <image src="{{object.data[1].src}}"></image>
  250 + </navigator>
  251 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
199 <image src="{{object.data[1].src}}"></image> 252 <image src="{{object.data[1].src}}"></image>
200 </view> 253 </view>
  254 +
201 </block> 255 </block>
202 256
203 </view> 257 </view>
@@ -209,10 +263,14 @@ @@ -209,10 +263,14 @@
209 <text>300*300</text> 263 <text>300*300</text>
210 </block> 264 </block>
211 <block wx:if="{{object.data[2].src!=''}}"> 265 <block wx:if="{{object.data[2].src!=''}}">
212 - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
213 - <image src="{{object.data[2].src}}">  
214 - </image> 266 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  267 + <image src="{{object.data[2].src}}"></image>
  268 + </navigator>
  269 +
  270 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  271 + <image src="{{object.data[2].src}}"></image>
215 </view> 272 </view>
  273 +
216 </block> 274 </block>
217 </view> 275 </view>
218 <view class='s7_gk7_1'> 276 <view class='s7_gk7_1'>
@@ -220,10 +278,14 @@ @@ -220,10 +278,14 @@
220 <text>300*150</text> 278 <text>300*150</text>
221 </block> 279 </block>
222 <block wx:if="{{object.data[3].src!=''}}"> 280 <block wx:if="{{object.data[3].src!=''}}">
223 - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
224 - <image src="{{object.data[3].src}}">  
225 - </image> 281 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  282 + <image src="{{object.data[3].src}}"></image>
  283 + </navigator>
  284 +
  285 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  286 + <image src="{{object.data[3].src}}"></image>
226 </view> 287 </view>
  288 +
227 </block> 289 </block>
228 </view> 290 </view>
229 </view> 291 </view>
@@ -233,38 +295,6 @@ @@ -233,38 +295,6 @@
233 <!--第8 5个图--> 295 <!--第8 5个图-->
234 <view class='s8' wx:if='{{object.style==8}}'> 296 <view class='s8' wx:if='{{object.style==8}}'>
235 297
236 - <!-- <block wx:for="{{object.data}}" > -->  
237 - <!-- <view class='s8_gk8'>  
238 -  
239 - <view class='s8_gk1'>  
240 -  
241 - <block wx:if="{{object.data[0].src==''}}">  
242 - <text>200*200</text>  
243 - </block>  
244 - <block wx:if="{{object.data[0].src!=''}}">  
245 - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
246 - <image src="{{object.data[0].src}}">  
247 - </image>  
248 - </view>  
249 - </block>  
250 - </view>  
251 - <view class='s8_gk1'>  
252 - <block wx:if="{{object.data[1].src==''}}">  
253 - <text>200*200</text>  
254 - </block>  
255 - <block wx:if="{{object.data[1].src!=''}}">  
256 - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
257 - <image src="{{object.data[1].src}}" mode="widthFix">  
258 - </image>  
259 - </view>  
260 - </block>  
261 - </view>  
262 - </view> -->  
263 -  
264 -  
265 -  
266 -  
267 -  
268 298
269 <view class='s8_gk8'> 299 <view class='s8_gk8'>
270 <view class='s8_gk1'> 300 <view class='s8_gk1'>
@@ -272,10 +302,14 @@ @@ -272,10 +302,14 @@
272 <text>200*200</text> 302 <text>200*200</text>
273 </block> 303 </block>
274 <block wx:if="{{object.data[0].src!=''}}"> 304 <block wx:if="{{object.data[0].src!=''}}">
275 - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
276 - <image src="{{object.data[0].src}}" >  
277 - </image> 305 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  306 + <image src="{{object.data[0].src}}" ></image>
  307 + </navigator>
  308 +
  309 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  310 + <image src="{{object.data[0].src}}" ></image>
278 </view> 311 </view>
  312 +
279 </block> 313 </block>
280 </view> 314 </view>
281 <view class='s8_gk1'> 315 <view class='s8_gk1'>
@@ -283,9 +317,12 @@ @@ -283,9 +317,12 @@
283 <text>200*200</text> 317 <text>200*200</text>
284 </block> 318 </block>
285 <block wx:if="{{object.data[1].src!=''}}"> 319 <block wx:if="{{object.data[1].src!=''}}">
286 - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
287 - <image src="{{object.data[1].src}}" >  
288 - </image> 320 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  321 + <image src="{{object.data[1].src}}" ></image>
  322 + </navigator>
  323 +
  324 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  325 + <image src="{{object.data[1].src}}" ></image>
289 </view> 326 </view>
290 </block> 327 </block>
291 </view> 328 </view>
@@ -298,10 +335,15 @@ @@ -298,10 +335,15 @@
298 <text>200*200</text> 335 <text>200*200</text>
299 </block> 336 </block>
300 <block wx:if="{{object.data[2].src!=''}}"> 337 <block wx:if="{{object.data[2].src!=''}}">
301 - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
302 - <image src="{{object.data[2].src}}" >  
303 - </image> 338 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  339 + <image src="{{object.data[2].src}}" ></image>
  340 + </navigator>
  341 +
  342 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  343 + <image src="{{object.data[2].src}}" ></image>
304 </view> 344 </view>
  345 +
  346 +
305 </block> 347 </block>
306 </view> 348 </view>
307 <view class='s8_gk1'> 349 <view class='s8_gk1'>
@@ -309,9 +351,12 @@ @@ -309,9 +351,12 @@
309 <text>200*200</text> 351 <text>200*200</text>
310 </block> 352 </block>
311 <block wx:if="{{object.data[3].src!=''}}"> 353 <block wx:if="{{object.data[3].src!=''}}">
312 - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
313 - <image src="{{object.data[3].src}}" >  
314 - </image> 354 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  355 + <image src="{{object.data[3].src}}" ></image>
  356 + </navigator>
  357 +
  358 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  359 + <image src="{{object.data[3].src}}" ></image>
315 </view> 360 </view>
316 </block> 361 </block>
317 </view> 362 </view>
@@ -325,10 +370,14 @@ @@ -325,10 +370,14 @@
325 <text>200*420</text> 370 <text>200*420</text>
326 </block> 371 </block>
327 <block wx:if="{{object.data[4].src!=''}}"> 372 <block wx:if="{{object.data[4].src!=''}}">
328 - <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
329 - <image src="{{object.data[4].src}}" style='height:492rpx'>  
330 - </image> 373 + <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
  374 + <image src="{{object.data[4].src}}" style='height:492rpx'></image>
  375 + </navigator>
  376 +
  377 + <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  378 + <image src="{{object.data[4].src}}" style='height:492rpx'></image>
331 </view> 379 </view>
  380 +
332 </block> 381 </block>
333 </view> 382 </view>
334 </view> 383 </view>
@@ -340,21 +389,20 @@ @@ -340,21 +389,20 @@
340 <block wx:if='{{object.style==4}}'> 389 <block wx:if='{{object.style==4}}'>
341 <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx" > 390 <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx" >
342 <block wx:for="{{object.data}}" wx:for-index="index" > 391 <block wx:for="{{object.data}}" wx:for-index="index" >
343 - <block wx:if="{{item.src!=''}}">  
344 - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
345 - <swiper-item>  
346 - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" />  
347 - </swiper-item>  
348 - </view>  
349 - </block>  
350 - <block wx:if="{{item.src==''}}">  
351 - <view url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">  
352 - <swiper-item>  
353 - <image src="" class="slide-image" mode="aspectFill" />  
354 - </swiper-item> 392 +
  393 +
  394 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  395 + <swiper-item><image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" /></swiper-item>
  396 + </navigator>
  397 +
  398 + <view url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  399 + <swiper-item><image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" /></swiper-item>
355 </view> 400 </view>
356 - </block> 401 +
  402 +
  403 +
  404 +
357 </block> 405 </block>
358 </swiper> 406 </swiper>
359 407
360 -</block>  
361 \ No newline at end of file 408 \ No newline at end of file
  409 +</block>
components/diy_advertising/diy_advertising.wxss
@@ -273,6 +273,7 @@ @@ -273,6 +273,7 @@
273 text-align: center; 273 text-align: center;
274 margin-right: 10rpx; 274 margin-right: 10rpx;
275 margin-bottom: 8rpx; 275 margin-bottom: 8rpx;
  276 + height: 360rpx;
276 } 277 }
277 278
278 .s8 { 279 .s8 {
components/diy_nav/diy_nav.wxml
  1 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
  2 +
1 <block wx:if="{{object.style==1}}"> 3 <block wx:if="{{object.style==1}}">
2 <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}"> 4 <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}">
3 <block wx:for="{{nav_list}}"> 5 <block wx:for="{{nav_list}}">
4 - <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">  
5 - <view style='width:{{100/nav_list.length}}%'  
6 - class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">  
7 - <block wx:if="{{item.navicon==null}}">  
8 - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'  
9 - class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"  
10 - src="{{imghost}}/miniapp/images/nav-icon.png"></image>  
11 - <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">  
12 - {{item.title}}  
13 - </view>  
14 - </block>  
15 - <block wx:if="{{item.navicon!=null}}">  
16 - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'  
17 - class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"  
18 - src="{{item.navicon}}"></image>  
19 - <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">  
20 - {{item.title}}  
21 - </view>  
22 - </block>  
23 - </view> 6 + <navigator url="{{item.wxapp_url}}" class="s1_gk_a1"
  7 + wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  8 + <include src="diy_nav_part1.wxml" />
  9 + </navigator>
  10 + <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  11 + <include src="diy_nav_part1.wxml" />
24 </view> 12 </view>
25 </block> 13 </block>
26 </view> 14 </view>
@@ -30,24 +18,12 @@ @@ -30,24 +18,12 @@
30 <view class="big_two"> 18 <view class="big_two">
31 <!-- 图片一 --> 19 <!-- 图片一 -->
32 <block wx:for="{{nav_list}}"> 20 <block wx:for="{{nav_list}}">
33 - <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">  
34 - <view class="one_div">  
35 - <view class="picture_one">  
36 - <block wx:if="{{item.navicon!=null}}">  
37 - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'  
38 - src="{{item.navicon}}">  
39 - </image>  
40 - </block>  
41 -  
42 - <block wx:if="{{item.navicon==null}}">  
43 - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'  
44 - src="{{imghost}}/miniapp/images/nav-icon.png">  
45 - </image>  
46 - </block>  
47 -  
48 - </view>  
49 - <view class="test">{{item.title}}</view>  
50 - </view> 21 + <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url"
  22 + wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  23 + <include src="diy_nav_part2.wxml" />
  24 + </navigator>
  25 + <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  26 + <include src="diy_nav_part2.wxml" />
51 </view> 27 </view>
52 </block> 28 </block>
53 </view> 29 </view>
components/diy_nav/diy_nav_part1.wxml 0 → 100644
  1 + <view style='width:{{100/nav_list.length}}%'
  2 + class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
  3 + <block wx:if="{{item.navicon==null}}">
  4 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  5 + class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
  6 + src="{{imghost}}/miniapp/images/nav-icon.png"></image>
  7 + <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
  8 + {{item.title}}
  9 + </view>
  10 + </block>
  11 + <block wx:if="{{item.navicon!=null}}">
  12 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  13 + class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
  14 + src="{{item.navicon}}"></image>
  15 + <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
  16 + {{item.title}}
  17 + </view>
  18 + </block>
  19 + </view>
  20 +
  21 +
  22 +
  23 +
components/diy_nav/diy_nav_part2.wxml 0 → 100644
  1 + <view class="one_div">
  2 + <view class="picture_one">
  3 + <block wx:if="{{item.navicon!=null}}">
  4 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  5 + src="{{item.navicon}}">
  6 + </image>
  7 + </block>
  8 +
  9 + <block wx:if="{{item.navicon==null}}">
  10 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  11 + src="{{imghost}}/miniapp/images/nav-icon.png">
  12 + </image>
  13 + </block>
  14 +
  15 + </view>
  16 + <view class="test">{{item.title}}</view>
  17 +</view>
components/diy_picMax/diy_picMax.wxml
1 <!--图片组合--> 1 <!--图片组合-->
2 -<!-- <view class="picMax" style="height: {{pic_height}}rpx"> --> 2 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
3 <view class="picMax" > 3 <view class="picMax" >
4 <view wx:for="{{object.data}}" class="pic_item width_{{item.x_span}} height_{{item.y_span}} mar_x{{item.fir.x}} mar_y{{item.fir.y}}"> 4 <view wx:for="{{object.data}}" class="pic_item width_{{item.x_span}} height_{{item.y_span}} mar_x{{item.fir.x}} mar_y{{item.fir.y}}">
5 - <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image> 5 + <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}" >
  6 + <navigator url="{{item.wxapp_url}}">
  7 + <image src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
  8 + </navigator>
  9 + </block>
  10 + <block wx:else>
  11 + <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
  12 + </block>
6 </view> 13 </view>
7 </view> 14 </view>
components/diy_title/diy_title.js
@@ -16,6 +16,14 @@ Component({ @@ -16,6 +16,14 @@ Component({
16 go_url:function (e) { 16 go_url:function (e) {
17 var url=e.currentTarget.dataset.url; 17 var url=e.currentTarget.dataset.url;
18 getApp().goto(url); 18 getApp().goto(url);
19 - } 19 + },
  20 +
  21 + berror:function(e){
  22 + var iurl=getApp().globalData.setting.imghost;
  23 + var ob={};
  24 + var txt="object.title_img";
  25 + ob[txt] = iurl +'/miniapp/images/logo.png';
  26 + this.setData(ob);
  27 + }
20 } 28 }
21 -})  
22 \ No newline at end of file 29 \ No newline at end of file
  30 +})
components/diy_title/diy_title.wxml
  1 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
  2 +<!--上下两块-->
1 <view class="big_rim"> 3 <view class="big_rim">
2 <view class="rim"> 4 <view class="rim">
3 - <image class="image_one" src="{{object.title_img}}"></image> 5 + <image class="image_one" src="{{object.title_img}}" binderror="berror"></image>
4 </view> 6 </view>
5 - <view data-url="{{object.wxapp_url}}" bindtap="go_url">  
6 - <view class="txet_rim">  
7 - <view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view> 7 +
  8 + <navigator url="{{object.wxapp_url}}" wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
  9 + <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
  10 + </navigator>
  11 +
  12 + <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else>
  13 + <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
8 </view> 14 </view>
  15 +
9 <block wx:if="{{object.title_right!= ''}}"> 16 <block wx:if="{{object.title_right!= ''}}">
10 <view bindtap="go_url" data-url='{{object.wxapp_url}}'> 17 <view bindtap="go_url" data-url='{{object.wxapp_url}}'>
11 <view class="right_rim"> 18 <view class="right_rim">
@@ -16,4 +23,4 @@ @@ -16,4 +23,4 @@
16 </view> 23 </view>
17 </view> 24 </view>
18 </block> 25 </block>
19 -</view>  
20 \ No newline at end of file 26 \ No newline at end of file
  27 +</view>
pages/error/error.js deleted
1 -var t = require("../../utils/common.js");var os=getApp().globalData.setting;  
2 -Page({  
3 - data:{  
4 - store:null,  
5 - imghots: os.imghost,  
6 - msg:"",  
7 - },  
8 -  
9 - onLoad:function(t){  
10 - var th=this,app = getApp();  
11 - app.getConfig(function(e){  
12 - th.setData({ store:e,msg:t.msg});  
13 - })  
14 - },  
15 -  
16 - getphone: function(e) {  
17 - var that = this;  
18 - var app=getApp(),a=app;  
19 - //此处授权得到userInfo  
20 - console.log("getphone");  
21 - e=e.detail;  
22 - console.log(e);  
23 - //接下来写业务代码登录  
24 - //最后,记得返回刚才的页面  
25 - if (e.encryptedData==undefined){  
26 - wx.navigateTo({  
27 - url: '/pages/user/binding_info/binding_info',  
28 - })  
29 - return false;  
30 - }  
31 - var r=getApp().globalData.getu;  
32 - var sessionKey = getApp().globalData.sessionKey;  
33 - var openid = getApp().globalData.openid;  
34 - var dd = {  
35 - oauth: "miniapp",  
36 - nickname: r.nickName,  
37 - head_pic: r.avatarUrl,  
38 - sex: r.gender,  
39 - terminal: "miniapp",  
40 - sessionKey: sessionKey,  
41 - openid:openid,  
42 - encryptedData: e.encryptedData,  
43 - iv: e.iv,  
44 - store_id: a.globalData.setting.stoid,  
45 - };  
46 - console.log(dd);  
47 -  
48 - app.request.get("/api/weshop/users/thirdLogin", {  
49 - data: dd,  
50 - success: function (e) {  
51 - console.log("thirdLogin");  
52 - console.log(e);  
53 - if (e.data.code == 0) {  
54 - app.globalData.user_id = e.data.data.user_id;  
55 - } else {  
56 - return app.showWarning("授权登入失败!");  
57 - }  
58 - wx.setStorageSync("isAuth", !0), a.globalData.userInfo = e.data.data, a.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);  
59 - wx.navigateBack({ delta: 1})  
60 -  
61 - },  
62 - failStatus: function (t) {  
63 - return "100" === t.data.result ? (i.goHome(), wx.navigateTo({  
64 - url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl  
65 - }), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", {  
66 - isShowLoading: !1,  
67 - data: {  
68 - token: a.request.getToken()  
69 - },  
70 - failStatus: function () {  
71 - return !1;  
72 - }  
73 - }), !1);  
74 - },  
75 - fail: function (t) {  
76 - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;  
77 - }  
78 - });  
79 - }  
80 -});  
pages/error/error.json deleted
1 -{}  
2 \ No newline at end of file 0 \ No newline at end of file
pages/error/error.wxml deleted
1 -<view class="all_page">  
2 - <view class="content">  
3 - <view><image class='logo' src="{{imghots+store.store_logo}}"> </image></view>  
4 - <view class="title">{{store.store_name}}</view>  
5 - <view>{{store.store_desc}}</view>  
6 - <view class="err">{{msg}}</view>  
7 - </view>  
8 -</view>  
9 \ No newline at end of file 0 \ No newline at end of file
pages/error/error.wxss deleted
1 -.all_page{  
2 - position: fixed;  
3 - height: 100%;  
4 - width: 100%;  
5 - background: #fff;  
6 - justify-content: center;/*水平居中*/  
7 -}  
8 -.all_page .content{  
9 - font-size: 30rpx;  
10 - text-align: center;  
11 - height: 400px;  
12 - width: 100%;  
13 - position: absolute;  
14 - top: 50%;  
15 - margin-top:-200px;  
16 -}  
17 -.logo{width: 140rpx; height: 140rpx; border-radius:50% }  
18 -.all_page .content .title{  
19 - font-size: 36rpx; margin: 20rpx 0  
20 -}  
21 -  
22 -.all_page .err{  
23 - color:red;  
24 - font-size: 36rpx;  
25 - margin-top: 300rpx;  
26 -}  
27 \ No newline at end of file 0 \ No newline at end of file
pages/getphone/getphone.js deleted
1 -var t = require("../../utils/common.js");var os=getApp().globalData.setting;  
2 -Page({  
3 - data:{  
4 - store:null,  
5 - imghots: os.imghost,  
6 - },  
7 -  
8 - onLoad: function (options) {  
9 - //--判断是否有接受到邀请人的ID--  
10 - if(options.first_leader){  
11 - this.setData({first_leader:options.first_leader});  
12 - }  
13 - },  
14 - onShow:function(){  
15 - var th=this,app = getApp();  
16 - var sessionKey = getApp().globalData.sessionKey;  
17 - var openid = getApp().globalData.openid;  
18 -  
19 - if (openid == "" || openid == null) {  
20 -  
21 - if (getApp().globalData.userInfo)  
22 - openid = getApp().globalData.userInfo.weapp_openid;  
23 - }  
24 - var r = getApp().globalData.getu;  
25 -  
26 - if (openid == "" || openid == null || r==null ){  
27 - getApp().globalData.user_id=null;  
28 - getApp().globalData.userInfo=null;  
29 - console.log("openid");  
30 - wx.navigateTo({ url: '/pages/togoin/togoin', })  
31 - return false;  
32 - }  
33 - var user_info=getApp().globalData.userInfo;  
34 - console.log("getphone");  
35 -  
36 - if(user_info!=null && user_info.mobile!=undefined && user_info.mobile!="" && user_info.mobile!=null){  
37 - wx.navigateBack({  
38 - delta: 1  
39 - })  
40 - }  
41 -  
42 - app.getConfig(function(e){  
43 - th.setData({ store:e});  
44 - })  
45 - },  
46 -  
47 - getphone: function(e) {  
48 - var that = this;  
49 - var app=getApp(),a=app;  
50 - //此处授权得到userInfo  
51 - console.log("getphone");  
52 -  
53 - e=e.detail;  
54 - console.log(e);  
55 - //接下来写业务代码登录  
56 - //最后,记得返回刚才的页面  
57 - if (e.encryptedData==undefined){  
58 - /*---  
59 - wx.navigateTo({  
60 - url: '/pages/user/binding_info/binding_info',  
61 - })--*/  
62 - return app.my_warnning("登录需要授权手机号码!", 0, that);  
63 - return false;  
64 - }  
65 - var r=getApp().globalData.getu;  
66 - var sessionKey = getApp().globalData.sessionKey;  
67 - var openid = getApp().globalData.openid;  
68 -  
69 - console.log(sessionKey,openid);  
70 - that.save_the_data(r,e,sessionKey,openid)  
71 -  
72 - },  
73 -  
74 - save_the_data:function (r,e,sessionKey,openid) {  
75 - var app=getApp(),a=app,th=this;  
76 - var dd = {  
77 - oauth: "miniapp",  
78 - nickname: r.nickName,  
79 - head_pic: r.avatarUrl,  
80 - sex: r.gender,  
81 - terminal: "miniapp",  
82 - sessionKey: sessionKey,  
83 - openid:openid,  
84 - encryptedData: e.encryptedData,  
85 - iv: e.iv,  
86 - store_id: getApp().globalData.setting.stoid,  
87 - };  
88 - //--如果有邀请人的时候--  
89 - if(th.data.first_leader){  
90 - dd.first_leader=th.data.first_leader;  
91 - }  
92 -  
93 - console.log(dd);  
94 - app.request.get("/api/weshop/users/thirdLogin", {  
95 - data: dd,  
96 - success: function (e) {  
97 - console.log("thirdLogin");  
98 - console.log(e);  
99 - if (e.data.code == 0) {  
100 - app.globalData.user_id = e.data.data.user_id;  
101 - } else {  
102 - return app.showWarning("授权登入失败!"+e.data.msg);  
103 - }  
104 -  
105 - wx.setStorageSync("userinfo",e.data.data);  
106 - wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);  
107 - wx.navigateBack({ delta: 1})  
108 -  
109 - },  
110 - failStatus: function (t) {  
111 - /*---  
112 - return "100" === t.data.result ? (i.goHome(), wx.navigateTo({  
113 - url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl  
114 - }), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", {  
115 - isShowLoading: !1,  
116 - data: {  
117 - token: a.request.getToken()  
118 - },  
119 - failStatus: function () {  
120 - return !1;  
121 - }  
122 - }), !1);--*/  
123 - return app.my_warnning("授权登入失败,请稍后再试!", 0, that);  
124 - },  
125 - fail: function (t) {  
126 - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;  
127 - }  
128 - });  
129 - },  
130 -  
131 - cancle_bind: function () {  
132 - getApp().goto('/pages/user/index/index');  
133 - }  
134 -  
135 -  
136 -  
137 -});  
pages/getphone/getphone.json deleted
1 -{  
2 - "navigationBarTitleText": "绑定手机",  
3 - "usingComponents": {  
4 - "warn": "/components/long_warn/long_warn"  
5 - }  
6 -}  
pages/getphone/getphone.wxml deleted
1 -<view class="all_page">  
2 - <view class="content">  
3 - <view><image class='logo' src="{{imghots+store.store_logo}}"> </image></view>  
4 - <view class="title">{{store.store_name}}</view>  
5 - <view>{{store.store_desc}}</view>  
6 - <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getphone">绑定会员</button>  
7 - <text class="btn2" bindtap="cancle_bind">暂不绑定</text>  
8 - </view>  
9 -</view>  
10 -<warn id="warn"></warn>  
11 \ No newline at end of file 0 \ No newline at end of file
pages/getphone/getphone.wxss deleted
1 -.all_page{  
2 - position: fixed;  
3 - height: 100%;  
4 - width: 100%;  
5 - background: #fff;  
6 - justify-content: center;/*水平居中*/  
7 -}  
8 -.all_page .content{  
9 - font-size: 30rpx;  
10 - text-align: center;  
11 - height: 400px;  
12 - width: 100%;  
13 - position: absolute;  
14 - top: 50%;  
15 - margin-top:-200px;  
16 -}  
17 -.logo{width: 140rpx; height: 140rpx; border-radius:50% }  
18 -.all_page .content .title{  
19 - font-size: 36rpx; margin: 20rpx 0  
20 -}  
21 -  
22 -.all_page .btn{  
23 - height: 80rpx;  
24 - line-height: 80rpx;  
25 - width: 580rpx;  
26 - background: #fc661f;  
27 - color:#fff;  
28 - font-size: 32rpx;  
29 - margin-top: 100rpx;  
30 - border-radius: 5rpx;  
31 -}  
32 -.all_page .btn2{  
33 - height: 80rpx;  
34 - line-height: 80rpx;  
35 - width: 580rpx;  
36 - color:#999;  
37 - font-size: 32rpx;  
38 - border-radius: 5rpx;  
39 - margin-top: 10rpx;  
40 -}  
41 \ No newline at end of file 0 \ No newline at end of file
pages/test/zhuli_test.js deleted
1 -var e = getApp(),  
2 - a = e.globalData.setting,  
3 - os = a;  
4 -var regeneratorRuntime = require('../../utils/runtime.js');  
5 -Page({  
6 -  
7 - /**  
8 - * 页面的初始数据  
9 - */  
10 - data: {  
11 - iurl: a.imghost, //图片地址前缀\  
12 - taskId:0,  
13 - mobile:0,  
14 - },  
15 - /**  
16 - * 生命周期函数--监听页面加载  
17 - */  
18 - onLoad: function(options) {  
19 - wx.setNavigationBarTitle({  
20 - title: "测试帮忙助力",  
21 - })  
22 - var th = this;  
23 - var taskId=options.taskId;  
24 - this.data.taskId=taskId;  
25 - },  
26 -  
27 - getphoneValue:function(e){  
28 - this.data.mobile=e.detail.value;  
29 - },  
30 - //测试正在进行任务  
31 - bindReg:async function () {  
32 - var userinfo=null;  
33 - await getApp().request.promiseGet("/api/weshop/users/page",{  
34 - data:{mobile:this.data.mobile,store_id:os.stoid}  
35 - }).then(res=>{  
36 - userinfo=res.data.data.pageData[0];  
37 - })  
38 - if(!userinfo) {  
39 - getApp().my_warnning("未找到会员",0,this); return false;  
40 - }  
41 -  
42 - var task=null;  
43 - await getApp().request.promiseGet("/api/weshop/marketing/help/help/task/get",{  
44 - data:{taskId:this.data.taskId,storeId:os.stoid,userId:userinfo.user_id}  
45 - }).then(res=>{  
46 - task=res.data.data;  
47 - })  
48 - if(!task) {  
49 - getApp().my_warnning("未找任务",0,this); return false;  
50 - }  
51 -  
52 - if(task.status!=0){  
53 - getApp().my_warnning("任务不是进行中",0,this); return false;  
54 - }  
55 - var taking=task.id;  
56 - getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taking + "&userId=" + userinfo.user_id);  
57 - },  
58 -  
59 -  
60 -})  
pages/test/zhuli_test.json deleted
1 -{  
2 - "navigationBarTitleText": "助力测试专用",  
3 - "usingComponents": {  
4 - "warn": "/components/long_warn/long_warn"  
5 - }  
6 -}  
7 \ No newline at end of file 0 \ No newline at end of file
pages/test/zhuli_test.wxml deleted
1 -<view class="index">  
2 -  
3 - <!-- 发送验证码登录注册 -->  
4 - <view class="sr">  
5 - <view class="inputs fs30">  
6 - <!-- 手机号码 -->  
7 - <view class="flex rel phone_view">  
8 - <image src="{{iurl}}/mddmscp/regico1.jpg" class="tubiao_set"></image>  
9 - <input class="input_phone" type="number" placeholder="请输入手机号码" placeholder-style="color:rgb(190,190,190);"  
10 - maxlength="11" bindinput="getphoneValue"></input>  
11 - </view>  
12 - </view>  
13 - <!-- 点击注册 -->  
14 - <view class="flex-center fs30 reg_btn" bindtap="bindReg">  
15 - <view class="userlogin flex-center on">  
16 - <view>去帮忙助力</view>  
17 - </view>  
18 - </view>  
19 - </view>  
20 -</view>  
21 -  
22 -<warn id="warn"></warn>  
pages/test/zhuli_test.wxss deleted
1 -page{  
2 - border-top: 3rpx solid #EAEAEC;  
3 -}  
4 -.index {  
5 - position: absolute; width: 100%;  
6 - z-index: 1;  
7 -}  
8 -  
9 -.logins {  
10 - width: 100%;  
11 - padding-top: 60rpx;  
12 - padding-bottom: 120rpx;  
13 -}  
14 -  
15 -.login_img {  
16 - width: 192rpx;  
17 - height: 192rpx;  
18 - border-radius: 50%  
19 -}  
20 -  
21 -.input_phone {  
22 - height: 55rpx;  
23 - line-height: 55rpx;  
24 - margin-left:10rpx ;  
25 - position: relative; top:10rpx  
26 -}  
27 -  
28 -.input_code {  
29 - width: 360rpx;  
30 - height: 55rpx;  
31 - line-height: 55rpx;  
32 - border-radius: 12rpx;  
33 - margin-right: 20rpx;  
34 - border: 3rpx solid rgb(230, 230, 230);  
35 - padding-left: 40rpx;  
36 - color:#ef8179  
37 -}  
38 -  
39 -.codes {  
40 - margin-bottom: 65rpx;  
41 -}  
42 -  
43 -.get_code {  
44 - width: 176rpx;  
45 - height: 65rpx;  
46 - line-height: 65rpx;  
47 - border:1rpx solid rgb(236, 109, 95);  
48 - color: #ed7067;  
49 - border-radius: 12rpx;  
50 - right: 0;  
51 - top:5rpx;  
52 -}  
53 -  
54 -.userlogin {  
55 - width: 100%;  
56 - height: 95rpx;  
57 - line-height: 95rpx;  
58 - background-color: #ffc5c0;  
59 - color: rgb(255, 255, 255);  
60 - margin-bottom: 30rpx;  
61 - margin-top: 50rpx  
62 - }  
63 -  
64 -.userlogin.on{  
65 - background-color: #eb6359;  
66 -}  
67 -  
68 -.go_index {  
69 - color: #9d9d9d;  
70 - margin-bottom: 300rpx;  
71 -}  
72 -  
73 -.sr {  
74 - width: 90%; margin: 0 auto;  
75 -}  
76 -  
77 -.checkbox {  
78 - width: 25rpx;  
79 - height: 25rpx;  
80 - color: rgb(0, 0, 0);  
81 - margin-right: 50rpx;  
82 - margin-bottom: 30rpx  
83 -}  
84 -  
85 -.agrs {  
86 - padding: 0rpx 65rpx;  
87 -}  
88 -  
89 -.agreement {  
90 - color: rgb(236, 109, 95);  
91 - display: initial;  
92 -}  
93 -  
94 -.popup {  
95 - position: fixed;  
96 - z-index: 10;  
97 - background-color: rgba(153, 153, 153, 0.568);  
98 - height: 100%;  
99 - width: 100%;  
100 -}  
101 -  
102 -.content {  
103 - max-height: 800rpx;  
104 -min-height: 100rpx;  
105 -padding: 60rpx 35rpx;  
106 -background-color: rgb(255, 255, 255);  
107 -width: 570rpx;  
108 -margin-bottom: 70rpx;  
109 -overflow-y: scroll;  
110 -border-radius: 15rpx;  
111 -line-height: 50rpx;  
112 -font-size: 26rpx;  
113 -color: #545454;  
114 -  
115 -  
116 -}  
117 -  
118 -.close {  
119 - width: 65rpx;  
120 - height: 65rpx;  
121 -}  
122 -  
123 -.xy {  
124 - display: initial;color: #9c9c9c; line-height: 34rpx  
125 -}  
126 -  
127 -.get_code.on{  
128 - color: #666;  
129 -}  
130 -.tubiao_set{  
131 - width: 50rpx; height: 64rpx; margin-right:30rpx; position: relative; top:5rpx;  
132 -}  
133 -.tubiao_set2{  
134 - width: 46rpx; height: 64rpx; margin-right:34rpx;  
135 -}  
136 -.phone_view{  
137 - border-bottom:1rpx solid #e8e8e8 ;  
138 - height: 96rpx; margin-top:50rpx  
139 -  
140 -}  
141 -.phone_view.mt{  
142 - margin-top:20rpx  
143 -}  
144 -.reg_btn{  
145 - margin-top:40rpx; margin-bottom: 20rpx  
146 -}  
pages/user/Change_phone/Change_phone.wxml
@@ -36,8 +36,6 @@ @@ -36,8 +36,6 @@
36 <view>温馨提示:</view> 36 <view>温馨提示:</view>
37 <view>1.更换手机号后下次可使用新手机号登录。 37 <view>1.更换手机号后下次可使用新手机号登录。
38 </view> 38 </view>
39 - <view>2.为保障数据安全,如遇旧手机遗失可联系商家进行解绑。  
40 - </view>  
41 <view>3.收到验证码而非本人操作时请及时更改密码。 39 <view>3.收到验证码而非本人操作时请及时更改密码。
42 </view> 40 </view>
43 </view> 41 </view>
pages/user/account_list/account_list.js deleted
1 -var t = function(t) {  
2 - return t && t.__esModule ? t : {  
3 - default: t  
4 - };  
5 -}(require("../../../utils/LoadMore.js")), e = getApp(), a = new t.default(), n = require("../../../utils/util.js");  
6 -  
7 -Page({  
8 - data: {  
9 - url: e.globalData.setting.url,  
10 - resourceUrl: e.globalData.setting.resourceUrl,  
11 - categories: [ {  
12 - name: "全部",  
13 - type: "all"  
14 - }, {  
15 - name: "赚取",  
16 - type: "plus"  
17 - }, {  
18 - name: "消费",  
19 - type: "minus"  
20 - } ],  
21 - activeType: "all",  
22 - accounts: null,  
23 - currentPage: 1  
24 - },  
25 - onLoad: function(t) {  
26 - var e = void 0 === t.type ? this.data.activeType : t.type;  
27 - a.init(this, "", "accounts"), this.requestAccountList(e);  
28 - },  
29 - changeTab: function(t) {  
30 - a.resetConfig(), this.data.accounts = null, this.data.currentPage = 1, this.requestAccountList(t.currentTarget.id);  
31 - },  
32 - requestAccountList: function(t) {  
33 - var e = this, u = "/api/user/account_list/type/" + t + "?p=" + e.data.currentPage;  
34 - this.setData({  
35 - activeType: t  
36 - }), a.request(u, function(t) {  
37 - e.data.currentPage++, t.data.result.forEach(function(t, e, a) {  
38 - t.changeTimeFommat = n.format(t.change_time, "yyyy-MM-dd hh:mm");  
39 - }), wx.stopPullDownRefresh();  
40 - });  
41 - },  
42 - onReachBottom: function() {  
43 - a.canloadMore() && this.requestAccountList(this.data.activeType);  
44 - },  
45 - onPullDownRefresh: function(t) {  
46 - this.data.accounts = null, this.data.currentPage = 1, a.resetConfig(), this.requestAccountList(this.data.activeType);  
47 - }  
48 -});  
49 \ No newline at end of file 0 \ No newline at end of file
pages/user/account_list/account_list.json deleted
1 -{  
2 - "navigationBarTitleText": "账户明细"  
3 -}  
4 \ No newline at end of file 0 \ No newline at end of file
pages/user/account_list/account_list.wxml deleted
1 -<view class="container">  
2 - <view class="navbar">  
3 - <view class="navbar-box" wx:for="{{categories}}" wx:key="{{index}}">  
4 - <view bindtap="changeTab" class="{{activeType==item.type?'navbar-item-on':''}}" id="{{item.type}}">  
5 - {{item.name}}  
6 - </view>  
7 - </view>  
8 - </view>  
9 - <view class="account-box">  
10 - <view class="account-item title">描述</view>  
11 - <view class="account-item title">余额增减</view>  
12 - <view class="account-item title">时间</view>  
13 - </view>  
14 - <view class="account-box" wx:for="{{accounts}}" wx:key="{{index}}">  
15 - <view class="account-item">{{item.desc}}</view>  
16 - <view class="account-item price">{{item.user_money}}</view>  
17 - <view class="account-item time">{{item.changeTimeFommat}}</view>  
18 - </view>  
19 -</view>  
pages/user/account_list/account_list.wxss deleted
1 -page {  
2 - background-color: white;  
3 -}  
4 -  
5 -.container {  
6 - padding: 20rpx 30rpx;  
7 -}  
8 -  
9 -.navbar {  
10 - width: 100%;  
11 -}  
12 -  
13 -.navbar-box {  
14 - font-size: 35rpx;  
15 - display: inline-block;  
16 - width: 33.333333%;  
17 - border: 1rpx solid #f8f8f8;  
18 - box-sizing: border-box;  
19 - text-align: center;  
20 - line-height: 85rpx;  
21 -}  
22 -  
23 -.navbar-item-on {  
24 - background-color: #e01222;  
25 - border-radius: 6rpx;  
26 -}  
27 -  
28 -.account-box {  
29 - width: 100%;  
30 - font-size: 28rpx;  
31 - padding: 20rpx 0;  
32 - border-bottom: 1rpx solid #f8f8f8;  
33 - padding-left: 5rpx;  
34 -}  
35 -  
36 -.account-item {  
37 - display: inline-block;  
38 - width: 33.333333%;  
39 - word-break: keep-all;  
40 - white-space: nowrap;  
41 - overflow: hidden;  
42 - text-overflow: ellipsis;  
43 -}  
44 -  
45 -.account-box .price {  
46 - color: #e01222;  
47 - text-align: center;  
48 -}  
49 -  
50 -.account-box .time {  
51 - color: #999999;  
52 -}  
53 -  
54 -.account-box .title {  
55 - text-align: center;  
56 -}  
57 \ No newline at end of file 0 \ No newline at end of file
pages/user/message_notice/message_notice.js deleted
1 -var t = getApp(), s = t.request, e = require("../../../utils/util.js");  
2 -  
3 -Page({  
4 - data: {  
5 - url: t.globalData.setting.url,  
6 - resourceUrl: t.globalData.setting.resourceUrl,  
7 - iurl: t.globalData.setting.imghost,  
8 - categories: [ {  
9 - name: "全部消息",  
10 - status: 0  
11 - }, {  
12 - name: "系统消息",  
13 - status: 1  
14 - } ],  
15 - activeStatus: 0,  
16 - messages: null  
17 - },  
18 - onLoad: function(t) {  
19 - var s = void 0 === t.status ? this.data.activeStatus : t.status;  
20 - this.requestMessages(s);  
21 - },  
22 - changeTab: function(t) {  
23 - this.requestMessages(t.currentTarget.dataset.status);  
24 - },  
25 - requestMessages: function(t) {  
26 - var a = this;  
27 - this.setData({  
28 - activeStatus: t  
29 - }), s.get("/api/user/message_list?type=" + t, {  
30 - success: function(t) {  
31 - t.data.result.forEach(function(t, s, a) {  
32 - t.sendTimeFommat = e.format(t.send_time, "yyyy-MM-dd");  
33 - }), a.setData({  
34 - messages: t.data.result  
35 - }), wx.stopPullDownRefresh();  
36 - }  
37 - });  
38 - },  
39 - onPullDownRefresh: function(t) {  
40 - this.requestMessages(this.data.activeStatus);  
41 - }  
42 -});  
43 \ No newline at end of file 0 \ No newline at end of file
pages/user/message_notice/message_notice.json deleted
1 -{  
2 - "navigationBarTitleText": "消息中心"  
3 -}  
4 \ No newline at end of file 0 \ No newline at end of file
pages/user/message_notice/message_notice.wxml deleted
1 -<view class="container">  
2 - <view class="type-navbar">  
3 - <view class="type-box" wx:for="{{categories}}" wx:key="{{index}}">  
4 - <view bindtap="changeTab" class="type-navbar-item {{activeStatus==item.status?'type-item-on':''}}" data-status="{{item.status}}">  
5 - {{item.name}}  
6 - </view>  
7 - </view>  
8 - </view>  
9 - <view class="msg-list">  
10 - <view class="msg-box" wx:for="{{messages}}" wx:key="{{index}}">  
11 - <view class="msg-time">{{item.sendTimeFommat}}</view>  
12 - <view>{{item.message}}</view>  
13 - </view>  
14 - </view>  
15 - <view class="no-data" wx:if="{{!messages||messages.length==0}}">  
16 - <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>  
17 - <view class="no-data-title">没有找到相关的记录</view>  
18 - <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>  
19 - </view>  
20 -</view>  
pages/user/message_notice/message_notice.wxss deleted
1 -.type-navbar {  
2 - white-space: nowrap;  
3 - display: flex;  
4 - width: 100%;  
5 - height: 80rpx;  
6 - background-color: #fff;  
7 -}  
8 -  
9 -.type-box {  
10 - width: 50%;  
11 - box-sizing: border-box;  
12 - font-size: 28rpx;  
13 - line-height: 76rpx;  
14 - padding: 0 20rpx;  
15 - text-align: center;  
16 - display: inline-block;  
17 - overflow: hidden;  
18 -}  
19 -  
20 -.type-navbar-item {  
21 - border-bottom: 4rpx solid #fff;  
22 -}  
23 -  
24 -.type-item-on {  
25 - border-bottom: 4rpx solid #e64340;  
26 -}  
27 -  
28 -.msg-box {  
29 - background-color: white;  
30 - padding: 20rpx 30rpx;  
31 - border-bottom: 2px solid #f8f8f8;  
32 - font-size: 30rpx;  
33 -}  
34 -  
35 -.msg-time {  
36 - padding: 10rpx 0;  
37 -}  
38 \ No newline at end of file 0 \ No newline at end of file
pages/user/points_list/points_list.js deleted
1 -var t = function(t) {  
2 - return t && t.__esModule ? t : {  
3 - default: t  
4 - };  
5 -}(require("../../../utils/LoadMore.js")), e = getApp(), a = new t.default(), i = require("../../../utils/util.js");  
6 -  
7 -Page({  
8 - data: {  
9 - url: e.globalData.setting.url,  
10 - resourceUrl: e.globalData.setting.resourceUrl,  
11 - categories: [ {  
12 - name: "全部",  
13 - type: "all"  
14 - }, {  
15 - name: "赚取",  
16 - type: "plus"  
17 - }, {  
18 - name: "消费",  
19 - type: "minus"  
20 - } ],  
21 - activeType: "all",  
22 - points: null,  
23 - currentPage: 1  
24 - },  
25 - onLoad: function(t) {  
26 - var e = void 0 === t.type ? this.data.activeType : t.type;  
27 - a.init(this, "", "points"), this.requestPointList(e);  
28 - },  
29 - changeTab: function(t) {  
30 - a.resetConfig(), this.data.points = null, this.data.currentPage = 1, this.requestPointList(t.currentTarget.id);  
31 - },  
32 - requestPointList: function(t) {  
33 - var e = this, n = "/api/user/points_list/type/" + t + "?p=" + e.data.currentPage;  
34 - this.setData({  
35 - activeType: t  
36 - }), a.request(n, function(t) {  
37 - e.data.currentPage++, t.data.result.forEach(function(t, e, a) {  
38 - t.changeTimeFommat = i.format(t.change_time, "yyyy-MM-dd hh:mm");  
39 - }), wx.stopPullDownRefresh();  
40 - });  
41 - },  
42 - onReachBottom: function() {  
43 - a.canloadMore() && this.requestPointList(this.data.activeType);  
44 - },  
45 - onPullDownRefresh: function(t) {  
46 - this.data.points = null, this.data.currentPage = 1, a.resetConfig(), this.requestPointList(this.data.activeType);  
47 - }  
48 -});  
49 \ No newline at end of file 0 \ No newline at end of file
pages/user/points_list/points_list.json deleted
1 -{  
2 - "navigationBarTitleText": "积分明细"  
3 -}  
4 \ No newline at end of file 0 \ No newline at end of file
pages/user/points_list/points_list.wxml deleted
1 -<view class="container">  
2 - <view class="navbar">  
3 - <view class="navbar-box" wx:for="{{categories}}" wx:key="{{index}}">  
4 - <view bindtap="changeTab" class="{{activeType==item.type?'navbar-item-on':''}}" id="{{item.type}}">  
5 - {{item.name}}  
6 - </view>  
7 - </view>  
8 - </view>  
9 - <view class="point-box">  
10 - <view class="point-item title">描述</view>  
11 - <view class="point-item title">积分</view>  
12 - <view class="point-item title">时间</view>  
13 - </view>  
14 - <view class="point-box" wx:for="{{points}}" wx:key="{{index}}">  
15 - <view class="point-item">{{item.desc}}</view>  
16 - <view class="point-item price">{{item.pay_points}}</view>  
17 - <view class="point-item time">{{item.changeTimeFommat}}</view>  
18 - </view>  
19 -</view>  
pages/user/points_list/points_list.wxss deleted
1 -page {  
2 - background-color: white;  
3 -}  
4 -  
5 -.container {  
6 - padding: 20rpx 30rpx;  
7 -}  
8 -  
9 -.navbar {  
10 - width: 100%;  
11 -}  
12 -  
13 -.navbar-box {  
14 - font-size: 35rpx;  
15 - display: inline-block;  
16 - width: 33.333333%;  
17 - border: 1rpx solid #f8f8f8;  
18 - box-sizing: border-box;  
19 - text-align: center;  
20 - line-height: 85rpx;  
21 -}  
22 -  
23 -.navbar-item-on {  
24 - background-color: #e01222;  
25 - border-radius: 6rpx;  
26 -}  
27 -  
28 -.point-box {  
29 - width: 100%;  
30 - font-size: 28rpx;  
31 - padding: 20rpx 0;  
32 - border-bottom: 1rpx solid #f8f8f8;  
33 - padding-left: 5rpx;  
34 -}  
35 -  
36 -.point-item {  
37 - display: inline-block;  
38 - width: 33.333333%;  
39 - word-break: keep-all;  
40 - white-space: nowrap;  
41 - overflow: hidden;  
42 - text-overflow: ellipsis;  
43 -}  
44 -  
45 -.point-box .price {  
46 - color: #e01222;  
47 - text-align: center;  
48 -}  
49 -  
50 -.point-box .time {  
51 - color: #999999;  
52 -}  
53 -  
54 -.point-box .title {  
55 - text-align: center;  
56 -}  
57 \ No newline at end of file 0 \ No newline at end of file
pages/user/recharge_list/recharge_list.js deleted
1 -var e = function(e) {  
2 - return e && e.__esModule ? e : {  
3 - default: e  
4 - };  
5 -}(require("../../../utils/LoadMore.js")), t = getApp(), r = new e.default(), a = require("../../../utils/util.js");  
6 -  
7 -Page({  
8 - data: {  
9 - url: t.globalData.setting.url,  
10 - resourceUrl: t.globalData.setting.resourceUrl,  
11 - iurl: t.globalData.setting.imghost,  
12 - recharges: null,  
13 - currentPage: 1  
14 - },  
15 - onLoad: function() {  
16 - r.init(this, "", "recharges"), this.requestChangeList();  
17 - },  
18 - requestChangeList: function() {  
19 - var e = this, t = "/api/user/recharge_list/?p=" + e.data.currentPage;  
20 - r.request(t, function(t) {  
21 - e.data.currentPage++, t.data.result.forEach(function(e, t, r) {  
22 - e.cTimeFommat = a.format(e.ctime, "yyyy-MM-dd");  
23 - }), wx.stopPullDownRefresh();  
24 - });  
25 - },  
26 - onReachBottom: function() {  
27 - r.canloadMore() && this.requestChangeList();  
28 - },  
29 - onPullDownRefresh: function() {  
30 - this.data.recharges = null, this.data.currentPage = 1, r.resetConfig(), this.requestChangeList();  
31 - }  
32 -});  
33 \ No newline at end of file 0 \ No newline at end of file
pages/user/recharge_list/recharge_list.json deleted
1 -{  
2 - "navigationBarTitleText": "充值记录"  
3 -}  
4 \ No newline at end of file 0 \ No newline at end of file
pages/user/recharge_list/recharge_list.wxml deleted
1 -<view class="container">  
2 - <view class="recharge-box">  
3 - <view class="recharge-item pay title">支付方式</view>  
4 - <view class="recharge-item time title">日期</view>  
5 - <view class="recharge-item price title">金额</view>  
6 - <view class="recharge-item status title">状态</view>  
7 - </view>  
8 - <view class="recharge-box" wx:for="{{recharges}}" wx:key="{{index}}">  
9 - <view class="recharge-item pay">{{item.pay_name?item.pay_name:''}}</view>  
10 - <view class="recharge-item time">{{item.cTimeFommat}}</view>  
11 - <view class="recharge-item price">{{item.account}}</view>  
12 - <view class="recharge-item status">{{item.pay_status==0?'待支付':''}}{{item.pay_status==1?'已支付':''}}{{item.pay_status==2?'支付失败':''}}</view>  
13 - </view>  
14 -</view>  
pages/user/recharge_list/recharge_list.wxss deleted
1 -page {  
2 - background-color: white;  
3 -}  
4 -  
5 -.recharge-box {  
6 - font-size: 28rpx;  
7 - padding: 25rpx 30rpx;  
8 - border-bottom: 1rpx solid #f8f8f8;  
9 -}  
10 -  
11 -.recharge-item {  
12 - display: inline-block;  
13 - word-break: keep-all;  
14 - white-space: nowrap;  
15 - overflow: hidden;  
16 - text-overflow: ellipsis;  
17 - color: #666666;  
18 - box-sizing: border-box;  
19 - text-align: center;  
20 -}  
21 -  
22 -.recharge-box .pay {  
23 - width: 35%;  
24 -}  
25 -  
26 -.recharge-box .time {  
27 - width: 23%;  
28 -}  
29 -  
30 -.recharge-box .price {  
31 - width: 20%;  
32 -}  
33 -  
34 -.recharge-box .status {  
35 - width: 22%;  
36 - color: #e01222;  
37 -}  
38 -  
39 -.recharge-box .title {  
40 - color: #666666;  
41 - font-size: 32rpx;  
42 -}  
43 \ No newline at end of file 0 \ No newline at end of file
pages/user/userinfo_edit/userinfo_edit.js deleted
1 -var e = getApp(), s = e.globalData.setting, a = e.request, i = require("../../../utils/md5.js"), t = require("../../../utils/common.js");  
2 -  
3 -Page({  
4 - data: {  
5 - url: s.url,  
6 - resourceUrl: s.resourceUrl,  
7 - user: null,  
8 - type: "",  
9 - canGetCode: !1  
10 - },  
11 - onLoad: function(s) {  
12 - var a = this;  
13 - this.setBarTitle(s.type), e.getUserInfo(function(e) {  
14 - a.setData({  
15 - user: e,  
16 - type: s.type  
17 - });  
18 - });  
19 - },  
20 - setBarTitle: function(e) {  
21 - var s = "修改个人信息";  
22 - "nickname" == e ? s = "修改昵称" : "mobile" == e ? s = "修改手机" : "email" == e ? s = "修改邮箱" : "password" == e ? s = "修改密码" : "paypwd" == e ? s = "修改支付密码" : "sex" == e && (s = "修改性别"),  
23 - wx.setNavigationBarTitle({  
24 - title: s  
25 - });  
26 - },  
27 - formSubmit: function(s) {  
28 - var a = this.data.type;  
29 - if (a) {  
30 - var i = s.detail.value;  
31 - "nickname" == a ? this.submitNickname(i) : "mobile" == a ? this.submitMobile(i) : "email" == a ? this.submitEmail(i) : "password" == a ? this.submitPassword(i) : "paypwd" == a ? this.submitPaypwd(i) : "sex" == a ? this.submitSex(i) : e.confirmBox("处理类型出错:" + a);  
32 - }  
33 - },  
34 - submitNickname: function(s) {  
35 - if (!s.nickname) return e.showWarning("请输入昵称"), !1;  
36 - this.requestUpdateUser({  
37 - nickname: s.nickname  
38 - });  
39 - },  
40 - submitMobile: function(s) {  
41 - return s.mobile ? s.mobile_code ? void this.requestUpdateUser({  
42 - mobile: s.mobile,  
43 - mobile_code: s.mobile_code  
44 - }) : (e.showWarning("请输入验证码"), !1) : (e.showWarning("请输入手机号"), !1);  
45 - },  
46 - submitEmail: function(s) {  
47 - return s.email ? s.email.indexOf("@") < 0 ? (e.showWarning("邮箱格式不正确"), !1) : void this.requestUpdateUser({  
48 - email: s.email  
49 - }) : (e.showWarning("请输入邮箱"), !1);  
50 - },  
51 - submitPassword: function(s) {  
52 - return this.data.user.password && !s.old_password ? (e.showWarning("请输入旧密码"), !1) : s.new_password ? s.confirm_password ? s.new_password.length < 6 || s.new_password.length > 18 ? (e.showWarning("密码长度不合法"),  
53 - !1) : s.new_password !== s.confirm_password ? (e.showWarning("两次密码不一致"), !1) : void a.post("/api/user/password", {  
54 - data: {  
55 - old_password: i("TPSHOP" + s.old_password),  
56 - new_password: i("TPSHOP" + s.new_password)  
57 - },  
58 - success: function(s) {  
59 - e.showSuccess("修改成功", function() {  
60 - wx.navigateBack();  
61 - });  
62 - }  
63 - }) : (e.showWarning("请输入确认密码"), !1) : (e.showWarning("请输入新密码"), !1);  
64 - },  
65 - submitPaypwd: function(s) {  
66 - return s.paypwd_mobile ? s.paypwd_code ? s.paypwd ? s.paypwd_confirm ? s.paypwd.length < 6 || s.paypwd.length > 18 ? (e.showWarning("密码长度不合法"),  
67 - !1) : s.paypwd !== s.paypwd_confirm ? (e.showWarning("两次密码不一致"), !1) : void a.post("/api/user/paypwd", {  
68 - data: {  
69 - new_password: i("TPSHOP" + s.paypwd),  
70 - mobile: s.paypwd_mobile,  
71 - paypwd_code: s.paypwd_code  
72 - },  
73 - success: function(s) {  
74 - e.showSuccess("修改成功", function() {  
75 - wx.navigateBack();  
76 - });  
77 - }  
78 - }) : (e.showWarning("请输入确认密码"), !1) : (e.showWarning("请输入新密码"), !1) : (e.showWarning("请输入验证码"),  
79 - !1) : (e.showWarning("请输入手机号"), !1);  
80 - },  
81 - submitSex: function(s) {  
82 - if (0 == this.data.user.sex) return e.showWarning("请选择性别"), !1;  
83 - this.requestUpdateUser({  
84 - sex: this.data.user.sex  
85 - });  
86 - },  
87 - changeGender: function(e) {  
88 - var s = "boy" == e.currentTarget.dataset.gender ? 1 : 2;  
89 - this.setData({  
90 - "user.sex": s  
91 - });  
92 - },  
93 - requestUpdateUser: function(e) {  
94 - a.post("/api/user/updateUserInfo", {  
95 - data: e,  
96 - success: function(e) {  
97 - wx.navigateBack();  
98 - }  
99 - });  
100 - },  
101 - setMobile: function(e) {  
102 - this.data.user.mobile = e.detail.value;  
103 - },  
104 - getCode: function(e) {  
105 - t.sendSmsCode(this.data.user.mobile);  
106 - }  
107 -});  
108 \ No newline at end of file 0 \ No newline at end of file
pages/user/userinfo_edit/userinfo_edit.json deleted
1 -{  
2 - "navigationBarTitleText": "修改个人资料",  
3 - "enablePullDownRefresh": false  
4 -}  
5 \ No newline at end of file 0 \ No newline at end of file
pages/user/userinfo_edit/userinfo_edit.wxml deleted
1 -<form bindsubmit="formSubmit">  
2 - <view class="container user-container">  
3 - <view class="label-input item" wx:if="{{type=='nickname'}}">  
4 - <text class="label">昵称</text>  
5 - <input autoFocus class="input" name="nickname" placeholder="请输入您的昵称" value="{{user.nickname}}"></input>  
6 - </view>  
7 - <block wx:if="{{type=='mobile'}}">  
8 - <view class="label-input item">  
9 - <text class="label">手机号</text>  
10 - <input autoFocus bindinput="setMobile" class="input" data-name="mobile" name="mobile" placeholder="请输入您的手机号" type="number" value="{{user.mobile}}"></input>  
11 - </view>  
12 - <view class="verify-box item">  
13 - <input class="verify-input" name="mobile_code" placeholder="请输入验证码"></input>  
14 - <button bindtap="getCode" class="verify-btn {{canGetCode?'btn-disable':''}}">获取短信验证码</button>  
15 - </view>  
16 - </block>  
17 - <view class="label-input item" wx:if="{{type=='email'}}">  
18 - <text class="label">邮箱</text>  
19 - <input autoFocus class="input" name="email" placeholder="请输入您的邮箱" value="{{user.email}}"></input>  
20 - </view>  
21 - <block wx:if="{{type=='password'}}">  
22 - <view class="label-input simple" wx:if="{{user.password}}">  
23 - <text class="label">旧密码</text>  
24 - <input autoFocus password class="input" name="old_password" placeholder="旧密码"></input>  
25 - </view>  
26 - <view class="label-input simple">  
27 - <text class="label">新密码</text>  
28 - <input password class="input" name="new_password" placeholder="新密码"></input>  
29 - </view>  
30 - <view class="label-input simple item">  
31 - <text class="label">确认密码</text>  
32 - <input password class="input" name="confirm_password" placeholder="确认密码"></input>  
33 - </view>  
34 - </block>  
35 - <block wx:if="{{type=='paypwd'}}">  
36 - <view class="label-input simple item">  
37 - <text class="label">手机号</text>  
38 - <input autoFocus bindinput="setMobile" class="input" name="paypwd_mobile" placeholder="请输入您的手机号" value="{{user.mobile}}"></input>  
39 - </view>  
40 - <view class="verify-box item">  
41 - <input class="verify-input" name="paypwd_code" placeholder="请输入验证码"></input>  
42 - <button bindtap="getCode" class="verify-btn {{canGetCode?'btn-disable':''}}">获取短信验证码</button>  
43 - </view>  
44 - <view class="label-input simple">  
45 - <text class="label">新密码</text>  
46 - <input password class="input" name="paypwd" placeholder="新密码"></input>  
47 - </view>  
48 - <view class="label-input simple item">  
49 - <text class="label">确认密码</text>  
50 - <input password class="input" name="paypwd_confirm" placeholder="确认密码"></input>  
51 - </view>  
52 - </block>  
53 - <view wx:if="{{type=='sex'}}">  
54 - <view class="gender-box">  
55 - <view bindtap="changeGender" class="gender boy {{user.sex==1&&'boy-click'}}" data-gender="boy" style="background-image:url('{{resourceUrl}}/static/images/bag.png');"></view>  
56 - </view>  
57 - <view class="gender-box">  
58 - <view bindtap="changeGender" class="gender girl {{user.sex==2&&'girl-click'}}" data-gender="girl" style="background-image:url('{{resourceUrl}}/static/images/bag.png');"></view>  
59 - </view>  
60 - </view>  
61 - <button class="submit" formType="submit">确认修改</button>  
62 - </view>  
63 -</form>  
pages/user/userinfo_edit/userinfo_edit.wxss deleted
1 -page {  
2 - background-color: white;  
3 -}  
4 -  
5 -.user-container {  
6 - padding-top: 100rpx;  
7 -}  
8 -  
9 -.label-input {  
10 - font-size: 28rpx;  
11 - width: 680rpx;  
12 - margin: 0 35rpx;  
13 - line-height: 90rpx;  
14 - border: 1rpx #ddd solid;  
15 - border-radius: 10rpx;  
16 -}  
17 -  
18 -.label {  
19 - box-sizing: border-box;  
20 - float: left;  
21 - padding: 0 25rpx;  
22 -}  
23 -  
24 -.input {  
25 - box-sizing: border-box;  
26 - float: left;  
27 - height: 90rpx;  
28 - width: 500rpx;  
29 - padding-right: 5rpx;  
30 -}  
31 -  
32 -.simple {  
33 - border: 0;  
34 - border-radius: 0;  
35 - border-bottom: 1rpx #ddd solid;  
36 -}  
37 -  
38 -.submit {  
39 - width: 600rpx;  
40 - margin: 0 75rpx;  
41 - background-color: #e30000;  
42 - color: white;  
43 - line-height: 90rpx;  
44 - border-radius: 10rpx;  
45 -}  
46 -  
47 -.verify-box {  
48 - font-size: 28rpx;  
49 - width: 680rpx;  
50 - margin: 0 35rpx;  
51 - line-height: 90rpx;  
52 -}  
53 -  
54 -.verify-input {  
55 - box-sizing: border-box;  
56 - float: left;  
57 - height: 90rpx;  
58 - width: 400rpx;  
59 - padding-left: 10rpx;  
60 -}  
61 -  
62 -.verify-btn {  
63 - box-sizing: border-box;  
64 - float: right;  
65 - line-height: 90rpx;  
66 - padding: 0 10rpx;  
67 - background-color: #ec5151;  
68 - color: white;  
69 - border-radius: 10rpx;  
70 -}  
71 -  
72 -.btn-disable {  
73 - background-color: grey;  
74 -}  
75 -  
76 -.item {  
77 - margin-bottom: 70rpx;  
78 -}  
79 -  
80 -.gender-box {  
81 - width: 50%;  
82 - float: left;  
83 - padding: 100rpx 0 200rpx 0;  
84 -}  
85 -  
86 -.gender {  
87 - background-repeat: no-repeat!important;  
88 - background-size: 4.48rem!important;  
89 - width: 2.13333rem;  
90 - height: 2.73067rem;  
91 - margin: 0 auto;  
92 -}  
93 -  
94 -.boy {  
95 - background-position: 0 0!important;  
96 -}  
97 -  
98 -.girl {  
99 - background-position: 0 -2.92267rem!important;  
100 -}  
101 -  
102 -.boy-click {  
103 - background-position: -2.34667rem 0!important;  
104 -}  
105 -  
106 -.girl-click {  
107 - background-position: -2.368rem -2.92267rem!important;  
108 -}  
109 \ No newline at end of file 0 \ No newline at end of file
pages/user/visit_log/visit_log.js deleted
1 -var t = function(t) {  
2 - return t && t.__esModule ? t : {  
3 - default: t  
4 - };  
5 -}(require("../../../utils/LoadMore.js")), i = getApp(), e = i.request, s = new t.default();  
6 -  
7 -Page({  
8 - data: {  
9 - url: i.globalData.setting.url,  
10 - resourceUrl: i.globalData.setting.resourceUrl,  
11 - visits: null,  
12 - currentPage: 1  
13 - },  
14 - onLoad: function() {  
15 - s.init(this, "", "visits"), this.requestVisitLog();  
16 - },  
17 - onShow: function() {  
18 - this.resetData(), this.requestVisitLog();  
19 - },  
20 - onPullDownRefresh: function() {  
21 - this.resetData(), this.requestVisitLog();  
22 - },  
23 - onReachBottom: function() {  
24 - s.canloadMore() && this.requestVisitLog();  
25 - },  
26 - requestVisitLog: function() {  
27 - var t = this, i = t.data.url + "/api/user/visit_log?p=" + t.data.currentPage;  
28 - s.request(i, function(i) {  
29 - t.data.currentPage++, wx.stopPullDownRefresh();  
30 - });  
31 - },  
32 - resetData: function() {  
33 - this.data.currentPage = 1, this.data.visits = null, s.resetConfig();  
34 - },  
35 - deleteVisit: function(t) {  
36 - var i = this, s = t.currentTarget.dataset.vidx, a = t.currentTarget.dataset.gidx, r = i.data.visits;  
37 - e.post("/api/user/del_visit_log", {  
38 - data: {  
39 - visit_ids: r[s].visit[a].visit_id  
40 - },  
41 - success: function(t) {  
42 - 1 == r[s].visit.length ? r.splice(s, 1) : r[s].visit.splice(a, 1), i.setData({  
43 - visits: r  
44 - });  
45 - }  
46 - });  
47 - }  
48 -});  
49 \ No newline at end of file 0 \ No newline at end of file
pages/user/visit_log/visit_log.json deleted
1 -{  
2 - "navigationBarTitleText": "访问记录"  
3 -}  
4 \ No newline at end of file 0 \ No newline at end of file
pages/user/visit_log/visit_log.wxml deleted
1 -<view class="container">  
2 - <block wx:for="{{visits}}" wx:for-index="vidx" wx:for-item="visit" wx:key="{{vidx}}">  
3 - <view class="log_date">  
4 - <view class="maleri30">{{visit.date}}</view>  
5 - </view>  
6 - <view class="visit" wx:for="{{visit.visit}}" wx:key="{{index}}">  
7 - <navigator class="goods_img" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">  
8 - <image class="wh100" src="{{url}}/api/goods/goodsThumImages?goods_id={{item.goods_id}}&width=200&height=200"></image>  
9 - </navigator>  
10 - <view class="goods_detail">  
11 - <navigator class="goods_name" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">  
12 - {{item.goods_name}}  
13 - </navigator>  
14 - <view class="goods_footer">  
15 - <text class="price">¥{{item.shop_price}}</text>  
16 - <navigator class="similar" url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">看相似</navigator>  
17 - <view bindtap="deleteVisit" class="similar" data-gidx="{{index}}" data-vidx="{{vidx}}">删除</view>  
18 - </view>  
19 - </view>  
20 - </view>  
21 - </block>  
22 -</view>  
pages/user/visit_log/visit_log.wxss deleted
1 -.log_date {  
2 - background-color: #fff;  
3 - font-size: 28rpx;  
4 - color: #666666;  
5 - padding: 28rpx 28rpx;  
6 - border-bottom: 1rpx solid #e3e5e9;  
7 -}  
8 -  
9 -.visit {  
10 - background-color: #fff;  
11 - font-size: 28rpx;  
12 - padding: 10rpx 25rpx;  
13 -}  
14 -  
15 -.goods_img {  
16 - width: 200rpx;  
17 - height: 200rpx;  
18 - float: left;  
19 -}  
20 -  
21 -.goods_detail {  
22 - padding: 25rpx 0 25rpx 15rpx;  
23 - width: 485rpx;  
24 - float: left;  
25 - border-bottom: 1rpx #e3e5e9 solid;  
26 -}  
27 -  
28 -.goods_name {  
29 - height: 64rpx;  
30 - line-height: 32rpx;  
31 - margin-bottom: 34rpx;  
32 - overflow: hidden;  
33 -}  
34 -  
35 -.goods_footer {  
36 - height: 50rpx;  
37 -}  
38 -  
39 -.price {  
40 - color: red;  
41 - float: left;  
42 - margin-top: 6rpx;  
43 -}  
44 -  
45 -.similar {  
46 - font-size: 26rpx;  
47 - color: #777777;  
48 - float: right;  
49 - padding: 6rpx;  
50 - border: 1rpx #bfbfbf solid;  
51 - border-radius: 4rpx;  
52 - margin-left: 10rpx;  
53 -}  
54 \ No newline at end of file 0 \ No newline at end of file