Commit 15952cb9823a219120778bdc2d669ac4c441dbdc
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
26 changed files
with
977 additions
and
262 deletions
app.json
1 | 1 | { |
2 | - "pages": [ | |
3 | - "pages/index/index/index", | |
4 | - "pages/goods/categoryList/categoryList", | |
5 | - "pages/cart/cart/cart", | |
6 | - "pages/cart/cart2/cart2", | |
7 | - "pages/cart/cart4/cart4", | |
8 | - "pages/goods/goodsInfo/goodsInfo", | |
9 | - "pages/goods/goodsList/goodsList", | |
10 | - "pages/goods/search/search", | |
11 | - "pages/order/refund_order/refund_order", | |
12 | - "pages/payment/payment/payment", | |
13 | - "pages/user/index/index", | |
14 | - "pages/user/order_list/order_list", | |
15 | - "pages/user/order_detail/order_detail", | |
16 | - "pages/user/address_list/address_list", | |
17 | - "pages/user/userinfo/userinfo", | |
18 | - "pages/user/return_goods_list/return_goods_list", | |
19 | - "pages/user/coupon/coupon", | |
20 | - "pages/user/checkcoupon/checkcoupon", | |
21 | - "pages/user/add_address/add_address", | |
22 | - "pages/user/withdrawals_list/withdrawals_list", | |
23 | - "pages/user/return_goods_info/return_goods_info", | |
24 | - "pages/user/return_goods/return_goods", | |
25 | - "pages/user/withdrawals/withdrawals", | |
26 | - "pages/user/express/express", | |
27 | - "pages/user/get_user_info/get_user_info", | |
28 | - "pages/activity/seckill_list/seckill_list", | |
29 | - "pages/activity/pind_list/pind_list", | |
30 | - "pages/togoin/togoin", | |
31 | - "pages/team/team_success/team_success", | |
32 | - "pages/team/team_show/team_show", | |
33 | - "pages/team/team_ping/team_ping", | |
34 | - "pages/cart/cart2_pt/cart2_pt", | |
35 | - "pages/cart/cart_wk/cart_wk", | |
36 | - "pages/user/member/menber", | |
37 | - "pages/user/member/bring/bring", | |
38 | - "pages/user/member/bring/msg/msg", | |
39 | - "pages/user/member/account/account", | |
40 | - "pages/user/member/account_unable/account_unable", | |
41 | - "pages/user/member/cash_record/cash_record", | |
42 | - "pages/user/coupons/coupons", | |
43 | - "pages/user/integral/integral", | |
44 | - "pages/user/integral/query/index", | |
45 | - "pages/user/integral/msg/msg", | |
46 | - "pages/user/userqy/userqy", | |
47 | - "pages/user/user_spsy/user_spsy", | |
48 | - "pages/user/user_fw/user_fw", | |
49 | - "pages/user/grow_value/grow_value", | |
50 | - "pages/payment/pay_success/pay_success", | |
51 | - "pages/user/plus/plus", | |
52 | - "pages/user/cardinfo/cardinfo", | |
53 | - "pages/user/Detailed/Detailed", | |
54 | - "pages/user/my_service/appment_main", | |
55 | - "pages/user/my_service/i_service", | |
56 | - "pages/user/my_service/cosmetology_list", | |
57 | - "pages/user/my_service/hist_service", | |
58 | - "pages/user/my_service/tment_details", | |
59 | - "pages/user/my_service/tment_eval", | |
60 | - "pages/user/my_service/tment_order_list", | |
61 | - "pages/user/my_service/beauty_deta", | |
62 | - "pages/user/labels/labels", | |
63 | - "pages/giftpack/birthdaygift/birthdaygift", | |
64 | - "pages/giftpack/evaluategift/evaluategift", | |
65 | - "pages/giftpack/newvipgift/newvipgift", | |
66 | - "pages/giftpack/payment/payment", | |
67 | - "pages/giftpack/buygiftpack/giftpackbuy", | |
68 | - "pages/giftpack/giftpacklist/giftpacklist", | |
69 | - "pages/giftpack/mygiftpack/mygiftpack", | |
70 | - "pages/user/assistance/giftpacklist", | |
71 | - "pages/user/assistance/task_assistance", | |
72 | - "pages/user/assistance/friend_assistance", | |
73 | - "pages/user/assistance/assistance_success", | |
74 | - "pages/user/assistance/assistance", | |
75 | - "pages/template/index", | |
76 | - "pages/store/index", | |
77 | - "pages/cart/cart2_inte/cart2_inte", | |
78 | - "pages/giftpack/festival/festival", | |
79 | - "pages/team/team_more/team_more", | |
80 | - "pages/user/deposit/deposit", | |
81 | - "pages/user/deposit/prepaid/msg/msg", | |
82 | - "pages/user/deposit/prepaid/prepaid", | |
83 | - "pages/distribution/distribution" | |
84 | - ], | |
85 | - "subPackages": [{ | |
86 | - "root": "packageA/", | |
87 | - "name":"pack1", | |
88 | - "pages": [ | |
89 | - "pages/prom_list/prom_list", | |
90 | - "pages/quan_list/quan_list", | |
91 | - "pages/quan_pro/quan_pro", | |
92 | - "pages/liveStream/liveStream", | |
93 | - "pages/liveStreamDetails/liveStreamDetails", | |
94 | - "pages/addCustomer/addCustomer", | |
95 | - "pages/goods_share/goods_share", | |
96 | - "pages/activity_share/activity_share", | |
97 | - "pages/live_share/live_share", | |
98 | - "pages/quan/quan", | |
99 | - "pages/chongzhi/chongzhi", | |
100 | - "pages/chongzhiDetails/chongzhiDetails", | |
101 | - "pages/jfbuy/jfbuy", | |
102 | - "pages/hongBao/hongBao", | |
103 | - "pages/hongBaoDetails/hongBaoDetails", | |
104 | - "pages/service_record/service_record", | |
105 | - "pages/checkin/checkin", | |
106 | - "pages/distribution/myteam/myteam", | |
107 | - "pages/distribution/order/order", | |
108 | - "pages/distribution/commision/commision", | |
109 | - "pages/distribution/rank/rank", | |
110 | - "pages/distribution/card/card", | |
111 | - "pages/distribution/goods/goods", | |
112 | - "pages/distribution/shop/shop", | |
113 | - "pages/distribution/rookie/rookie", | |
114 | - "pages/service_share/service_share", | |
115 | - "pages/cardList/cardList", | |
116 | - "pages/goodsInfo/goodsInfo", | |
117 | - "pages/my_service/appment_main", | |
118 | - "pages/my_service/i_service", | |
119 | - "pages/my_service/cosmetology_list", | |
120 | - "pages/my_service/hist_service", | |
121 | - "pages/my_service/tment_details", | |
122 | - "pages/my_service/tment_eval", | |
123 | - "pages/my_service/tment_order_list", | |
124 | - "pages/my_service/beauty_deta", | |
125 | - "pages/my_service2/appment_main", | |
126 | - "pages/profile/profile", | |
127 | - "pages/parseHtml/parseHtml", | |
128 | - "pages/myGift/myGift", | |
129 | - "pages/myGiftDetails/myGiftDetails", | |
130 | - "pages/cart2_ser/cart2_ser", | |
131 | - "pages/libao_payment/payment", | |
132 | - "pages/details_serviceCard/details_serviceCard" | |
133 | - ] | |
134 | - | |
135 | - }, | |
136 | - { | |
137 | - "root": "packageB/", | |
138 | - "name":"pack2", | |
139 | - "pages": [ | |
140 | - "pages/user/collect_list/collect_list", | |
141 | - "pages/user/comment/comment", | |
142 | - "pages/user/view_comment/view_comment", | |
143 | - "pages/user/add_comment/add_comment", | |
144 | - "pages/user/user_coupon/user_coupon", | |
145 | - "pages/user/buyDetails/buyDetails", | |
146 | - "pages/evaluate/evaluate", | |
147 | - "pages/evaluate_list/evaluate_list", | |
148 | - "pages/luckactivity/luckinfo/luckinfo", | |
149 | - "pages/luckactivity/index/index", | |
150 | - "pages/user/Change_phone/Change_phone", | |
151 | - "pages/zuhegou/index/index", | |
152 | - "pages/zuhegou/list/list", | |
153 | - "pages/user/binding_info/binding_info", | |
154 | - "pages/user/choice_guide/choice_guide", | |
155 | - "pages/video/index", | |
156 | - "pages/boxes-list/boxes-list", | |
157 | - "pages/boxes-details/boxes-details" | |
158 | - ] | |
159 | -}, | |
160 | -{ | |
161 | - "root": "packageC/", | |
162 | - "name":"pack3", | |
163 | - "pages": [ | |
164 | - "pages/group_list/group_list", | |
165 | - "pages/presell/list/list", | |
166 | - "pages/presell/cart/cart", | |
167 | - "pages/presell/cart/cart2", | |
168 | - "pages/presell/cart/cart2_pre", | |
169 | - "pages/presell/goodsInfo/goodsInfo", | |
170 | - "pages/goods/distributionCategoryList/index", | |
171 | - "pages/goods/goodsList/goodsList", | |
172 | - "pages/payForAnother/payForAnother", | |
173 | - "pages/luckyGo/luckyGo_cart/luckyGo_cart", | |
174 | - "pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct", | |
175 | - "pages/luckyGo/luckyGo_list/luckyGo_list", | |
176 | - "pages/luckyGo/luckyGo_order/luckyGo_order", | |
177 | - "pages/luckyGo/luckyGo_details/luckyGo_details", | |
178 | - "pages/luckyGo/luckyGo_winners/luckyGo_winners", | |
179 | - "pages/luckyGo/luckyGo_members/luckyGo_members", | |
180 | - "pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo", | |
181 | - "pages/luckyGo/luckyGo_activityList/luckyGo_activityList" | |
182 | - ] | |
183 | -} | |
184 | - | |
185 | -], | |
186 | - "permission": { | |
187 | - "scope.userLocation": { | |
188 | - "desc": "获取你的位置信息" | |
189 | - } | |
190 | - }, | |
191 | - "window": { | |
192 | - "backgroundTextStyle": "light", | |
193 | - "navigationBarTextStyle": "black", | |
194 | - "navigationBarTitleText": "加载中...", | |
195 | - "navigationBarBackgroundColor": "#ffffff", | |
196 | - "backgroundColor": "#ffffff", | |
197 | - "enablePullDownRefresh": true | |
198 | - | |
199 | - }, | |
200 | - | |
201 | - "tabBar": { | |
202 | - "custom":true, | |
203 | - "color": "#6e6d6b", | |
204 | - "selectedColor": "#f23030", | |
205 | - "borderStyle": "white", | |
206 | - "backgroundColor": "#ffffff", | |
207 | - "list": [ | |
2 | + "pages": [ | |
3 | + "pages/index/index/index", | |
4 | + "pages/goods/categoryList/categoryList", | |
5 | + "pages/cart/cart/cart", | |
6 | + "pages/cart/cart2/cart2", | |
7 | + "pages/cart/cart4/cart4", | |
8 | + "pages/goods/goodsInfo/goodsInfo", | |
9 | + "pages/goods/goodsList/goodsList", | |
10 | + "pages/goods/search/search", | |
11 | + "pages/order/refund_order/refund_order", | |
12 | + "pages/payment/payment/payment", | |
13 | + "pages/user/index/index", | |
14 | + "pages/user/order_list/order_list", | |
15 | + "pages/user/order_detail/order_detail", | |
16 | + "pages/user/address_list/address_list", | |
17 | + "pages/user/userinfo/userinfo", | |
18 | + "pages/user/return_goods_list/return_goods_list", | |
19 | + "pages/user/coupon/coupon", | |
20 | + "pages/user/checkcoupon/checkcoupon", | |
21 | + "pages/user/add_address/add_address", | |
22 | + "pages/user/withdrawals_list/withdrawals_list", | |
23 | + "pages/user/return_goods_info/return_goods_info", | |
24 | + "pages/user/return_goods/return_goods", | |
25 | + "pages/user/withdrawals/withdrawals", | |
26 | + "pages/user/express/express", | |
27 | + "pages/user/get_user_info/get_user_info", | |
28 | + "pages/activity/seckill_list/seckill_list", | |
29 | + "pages/activity/pind_list/pind_list", | |
30 | + "pages/togoin/togoin", | |
31 | + "pages/team/team_success/team_success", | |
32 | + "pages/team/team_show/team_show", | |
33 | + "pages/team/team_ping/team_ping", | |
34 | + "pages/cart/cart2_pt/cart2_pt", | |
35 | + "pages/cart/cart_wk/cart_wk", | |
36 | + "pages/user/member/menber", | |
37 | + "pages/user/member/bring/bring", | |
38 | + "pages/user/member/bring/msg/msg", | |
39 | + "pages/user/member/account/account", | |
40 | + "pages/user/member/account_unable/account_unable", | |
41 | + "pages/user/member/cash_record/cash_record", | |
42 | + "pages/user/coupons/coupons", | |
43 | + "pages/user/integral/integral", | |
44 | + "pages/user/integral/query/index", | |
45 | + "pages/user/integral/msg/msg", | |
46 | + "pages/user/userqy/userqy", | |
47 | + "pages/user/user_spsy/user_spsy", | |
48 | + "pages/user/user_fw/user_fw", | |
49 | + "pages/user/grow_value/grow_value", | |
50 | + "pages/payment/pay_success/pay_success", | |
51 | + "pages/user/plus/plus", | |
52 | + "pages/user/cardinfo/cardinfo", | |
53 | + "pages/user/Detailed/Detailed", | |
54 | + "pages/user/my_service/appment_main", | |
55 | + "pages/user/my_service/i_service", | |
56 | + "pages/user/my_service/cosmetology_list", | |
57 | + "pages/user/my_service/hist_service", | |
58 | + "pages/user/my_service/tment_details", | |
59 | + "pages/user/my_service/tment_eval", | |
60 | + "pages/user/my_service/tment_order_list", | |
61 | + "pages/user/my_service/beauty_deta", | |
62 | + "pages/user/labels/labels", | |
63 | + "pages/giftpack/birthdaygift/birthdaygift", | |
64 | + "pages/giftpack/evaluategift/evaluategift", | |
65 | + "pages/giftpack/newvipgift/newvipgift", | |
66 | + "pages/giftpack/payment/payment", | |
67 | + "pages/giftpack/buygiftpack/giftpackbuy", | |
68 | + "pages/giftpack/giftpacklist/giftpacklist", | |
69 | + "pages/giftpack/mygiftpack/mygiftpack", | |
70 | + "pages/user/assistance/giftpacklist", | |
71 | + "pages/user/assistance/task_assistance", | |
72 | + "pages/user/assistance/friend_assistance", | |
73 | + "pages/user/assistance/assistance_success", | |
74 | + "pages/user/assistance/assistance", | |
75 | + "pages/store/index", | |
76 | + "pages/cart/cart2_inte/cart2_inte", | |
77 | + "pages/giftpack/festival/festival", | |
78 | + "pages/team/team_more/team_more", | |
79 | + "pages/user/deposit/deposit", | |
80 | + "pages/user/deposit/prepaid/msg/msg", | |
81 | + "pages/user/deposit/prepaid/prepaid", | |
82 | + "pages/distribution/distribution", | |
83 | + "pages/template/index" | |
84 | + ], | |
85 | + "subPackages": [ | |
208 | 86 | { |
209 | - "pagePath": "pages/index/index/index", | |
210 | - "text": "首页", | |
211 | - "iconPath": "packageA/images/bar/index.png", | |
212 | - "selectedIconPath": "packageA/images/bar/index_on.png" | |
87 | + "root": "packageA/", | |
88 | + "name": "pack1", | |
89 | + "pages": [ | |
90 | + "pages/prom_list/prom_list", | |
91 | + "pages/quan_list/quan_list", | |
92 | + "pages/quan_pro/quan_pro", | |
93 | + "pages/liveStream/liveStream", | |
94 | + "pages/liveStreamDetails/liveStreamDetails", | |
95 | + "pages/addCustomer/addCustomer", | |
96 | + "pages/goods_share/goods_share", | |
97 | + "pages/activity_share/activity_share", | |
98 | + "pages/live_share/live_share", | |
99 | + "pages/quan/quan", | |
100 | + "pages/chongzhi/chongzhi", | |
101 | + "pages/chongzhiDetails/chongzhiDetails", | |
102 | + "pages/jfbuy/jfbuy", | |
103 | + "pages/hongBao/hongBao", | |
104 | + "pages/hongBaoDetails/hongBaoDetails", | |
105 | + "pages/service_record/service_record", | |
106 | + "pages/checkin/checkin", | |
107 | + "pages/distribution/myteam/myteam", | |
108 | + "pages/distribution/order/order", | |
109 | + "pages/distribution/commision/commision", | |
110 | + "pages/distribution/rank/rank", | |
111 | + "pages/distribution/card/card", | |
112 | + "pages/distribution/goods/goods", | |
113 | + "pages/distribution/shop/shop", | |
114 | + "pages/distribution/rookie/rookie", | |
115 | + "pages/service_share/service_share", | |
116 | + "pages/cardList/cardList", | |
117 | + "pages/goodsInfo/goodsInfo", | |
118 | + "pages/my_service/appment_main", | |
119 | + "pages/my_service/i_service", | |
120 | + "pages/my_service/cosmetology_list", | |
121 | + "pages/my_service/hist_service", | |
122 | + "pages/my_service/tment_details", | |
123 | + "pages/my_service/tment_eval", | |
124 | + "pages/my_service/tment_order_list", | |
125 | + "pages/my_service/beauty_deta", | |
126 | + "pages/my_service2/appment_main", | |
127 | + "pages/profile/profile", | |
128 | + "pages/parseHtml/parseHtml", | |
129 | + "pages/myGift/myGift", | |
130 | + "pages/myGiftDetails/myGiftDetails", | |
131 | + "pages/cart2_ser/cart2_ser", | |
132 | + "pages/libao_payment/payment", | |
133 | + "pages/details_serviceCard/details_serviceCard" | |
134 | + ] | |
213 | 135 | }, |
214 | 136 | { |
215 | - "pagePath": "pages/goods/categoryList/categoryList", | |
216 | - "text": "分类", | |
217 | - "iconPath": "packageA/images/bar/fl.png", | |
218 | - "selectedIconPath": "packageA/images/bar/fl_on.png" | |
137 | + "root": "packageB/", | |
138 | + "name": "pack2", | |
139 | + "pages": [ | |
140 | + "pages/user/collect_list/collect_list", | |
141 | + "pages/user/comment/comment", | |
142 | + "pages/user/view_comment/view_comment", | |
143 | + "pages/user/add_comment/add_comment", | |
144 | + "pages/user/user_coupon/user_coupon", | |
145 | + "pages/user/buyDetails/buyDetails", | |
146 | + "pages/evaluate/evaluate", | |
147 | + "pages/evaluate_list/evaluate_list", | |
148 | + "pages/luckactivity/luckinfo/luckinfo", | |
149 | + "pages/luckactivity/index/index", | |
150 | + "pages/user/Change_phone/Change_phone", | |
151 | + "pages/zuhegou/index/index", | |
152 | + "pages/zuhegou/list/list", | |
153 | + "pages/user/binding_info/binding_info", | |
154 | + "pages/user/choice_guide/choice_guide", | |
155 | + "pages/video/index", | |
156 | + "pages/boxes-list/boxes-list", | |
157 | + "pages/boxes-details/boxes-details", | |
158 | + "pages/AI-test-skin/index/aiskin", | |
159 | + "pages/AI-test-skin/shoot_notice/shoot_notice", | |
160 | + "pages/AI-test-skin/history_record/history_record", | |
161 | + "pages/AI-test-skin/select_photo/select_photo", | |
162 | + "pages/AI-test-skin/fail_result/fail_result", | |
163 | + "pages/AI-test-skin/success_result/success_result", | |
164 | + "pages/AI-test-skin/analyse/analyse" | |
165 | + ] | |
219 | 166 | }, |
220 | - { | |
221 | - "pagePath": "pages/distribution/distribution", | |
222 | - "text": "分销", | |
223 | - "iconPath": "packageA/images/bar/fx.png", | |
224 | - "selectedIconPath": "packageA/images/bar/fx_on.png" | |
225 | - }, | |
226 | 167 | { |
227 | - "pagePath": "pages/cart/cart/cart", | |
228 | - "text": "购物车", | |
229 | - "iconPath": "packageA/images/bar/car.png", | |
230 | - "selectedIconPath": "packageA/images/bar/car_on.png" | |
231 | - }, | |
232 | - { | |
233 | - "pagePath": "pages/user/index/index", | |
234 | - "text": "我的", | |
235 | - "iconPath": "packageA/images/bar/user.png", | |
236 | - "selectedIconPath": "packageA/images/bar/user_on.png" | |
168 | + "root": "packageC/", | |
169 | + "name": "pack3", | |
170 | + "pages": [ | |
171 | + "pages/group_list/group_list", | |
172 | + "pages/presell/list/list", | |
173 | + "pages/presell/cart/cart", | |
174 | + "pages/presell/cart/cart2", | |
175 | + "pages/presell/cart/cart2_pre", | |
176 | + "pages/presell/goodsInfo/goodsInfo", | |
177 | + "pages/goods/distributionCategoryList/index", | |
178 | + "pages/goods/goodsList/goodsList", | |
179 | + "pages/payForAnother/payForAnother", | |
180 | + "pages/luckyGo/luckyGo_cart/luckyGo_cart", | |
181 | + "pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct", | |
182 | + "pages/luckyGo/luckyGo_list/luckyGo_list", | |
183 | + "pages/luckyGo/luckyGo_order/luckyGo_order", | |
184 | + "pages/luckyGo/luckyGo_details/luckyGo_details", | |
185 | + "pages/luckyGo/luckyGo_winners/luckyGo_winners", | |
186 | + "pages/luckyGo/luckyGo_members/luckyGo_members", | |
187 | + "pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo", | |
188 | + "pages/luckyGo/luckyGo_activityList/luckyGo_activityList" | |
189 | + ] | |
190 | + } | |
191 | + ], | |
192 | + "permission": { | |
193 | + "scope.userLocation": { | |
194 | + "desc": "获取你的位置信息" | |
237 | 195 | } |
238 | - ] | |
239 | - }, | |
240 | - "debug": false, | |
241 | - "sitemapLocation": "sitemap.json", | |
242 | - "usingComponents": { | |
243 | - "customtabbar":"custom-tab-bar/index" | |
244 | - }, | |
196 | + }, | |
197 | + "window": { | |
198 | + "backgroundTextStyle": "light", | |
199 | + "navigationBarTextStyle": "black", | |
200 | + "navigationBarTitleText": "加载中...", | |
201 | + "navigationBarBackgroundColor": "#ffffff", | |
202 | + "backgroundColor": "#ffffff", | |
203 | + "enablePullDownRefresh": true | |
204 | + }, | |
205 | + "tabBar": { | |
206 | + "custom": true, | |
207 | + "color": "#6e6d6b", | |
208 | + "selectedColor": "#f23030", | |
209 | + "borderStyle": "white", | |
210 | + "backgroundColor": "#ffffff", | |
211 | + "list": [ | |
212 | + { | |
213 | + "pagePath": "pages/index/index/index", | |
214 | + "text": "首页", | |
215 | + "iconPath": "packageA/images/bar/index.png", | |
216 | + "selectedIconPath": "packageA/images/bar/index_on.png" | |
217 | + }, | |
218 | + { | |
219 | + "pagePath": "pages/goods/categoryList/categoryList", | |
220 | + "text": "分类", | |
221 | + "iconPath": "packageA/images/bar/fl.png", | |
222 | + "selectedIconPath": "packageA/images/bar/fl_on.png" | |
223 | + }, | |
224 | + { | |
225 | + "pagePath": "pages/distribution/distribution", | |
226 | + "text": "分销", | |
227 | + "iconPath": "packageA/images/bar/fx.png", | |
228 | + "selectedIconPath": "packageA/images/bar/fx_on.png" | |
229 | + }, | |
230 | + { | |
231 | + "pagePath": "pages/cart/cart/cart", | |
232 | + "text": "购物车", | |
233 | + "iconPath": "packageA/images/bar/car.png", | |
234 | + "selectedIconPath": "packageA/images/bar/car_on.png" | |
235 | + }, | |
236 | + { | |
237 | + "pagePath": "pages/user/index/index", | |
238 | + "text": "我的", | |
239 | + "iconPath": "packageA/images/bar/user.png", | |
240 | + "selectedIconPath": "packageA/images/bar/user_on.png" | |
241 | + } | |
242 | + ] | |
243 | + }, | |
244 | + "debug": false, | |
245 | + "sitemapLocation": "sitemap.json", | |
246 | + "usingComponents": { | |
247 | + "customtabbar": "custom-tab-bar/index" | |
248 | + }, | |
245 | 249 | "useExtendedLib": { |
246 | - "weui": true | |
250 | + "weui": true | |
247 | 251 | } |
248 | - | |
249 | 252 | } |
250 | 253 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/analyse/analyse.js
0 → 100644
1 | +// packageB/pages/AI-test-skin/analyse/analyse.js | |
2 | +const app = getApp(); | |
3 | +const request = app.request; | |
4 | +const os = app.globalData; | |
5 | +const setting = os.setting; | |
6 | +const ut = require('../../../../utils/util'); | |
7 | +Page({ | |
8 | + | |
9 | + /** | |
10 | + * 页面的初始数据 | |
11 | + */ | |
12 | + data: { | |
13 | + iurl: setting.imghost, | |
14 | + per:0, | |
15 | + timer:0, | |
16 | + img:null, | |
17 | + sourceimg:null, | |
18 | + err_map:null, | |
19 | + }, | |
20 | + | |
21 | + /** | |
22 | + * 生命周期函数--监听页面加载 | |
23 | + */ | |
24 | + onLoad: function (options) { | |
25 | + var th=this; | |
26 | + //设置错误码分析 | |
27 | + this.set_err_map(); | |
28 | + //进度条加载 | |
29 | + this.timer(); | |
30 | + //接口开始分析 | |
31 | + setTimeout(function () { | |
32 | + th.analysis_img(); | |
33 | + },800) | |
34 | + | |
35 | + }, | |
36 | + //定时器 | |
37 | + timer:function (func) { | |
38 | + var per=this.data.per+5; | |
39 | + var th=this; | |
40 | + if(per<96){ | |
41 | + th.setData({per:per}); | |
42 | + setTimeout(function () { | |
43 | + th.timer(); | |
44 | + },400) | |
45 | + } | |
46 | + }, | |
47 | + | |
48 | + //错误码表 | |
49 | + set_err_map:function () { | |
50 | + var map={ | |
51 | + "2":"服务暂不可用", | |
52 | + "4":"集群超限额", | |
53 | + "6":"没有接口权限", | |
54 | + "17":"每天流量超限额", | |
55 | + "18":"QPS超限额", | |
56 | + "19":"请求总量超限额", | |
57 | + "100":"无效的access_token参数", | |
58 | + "110":"Access Token失效", | |
59 | + "111":" Access token过期", | |
60 | + "222001":"必要参数未传入", | |
61 | + "222002":"参数格式错误", | |
62 | + "222003":"参数格式错误", | |
63 | + "222004":"参数格式错误", | |
64 | + "222005":"参数格式错误", | |
65 | + "222006":"参数格式错误", | |
66 | + "222007":"参数格式错误", | |
67 | + "222008":"参数格式错误", | |
68 | + "222009":"参数格式错误", | |
69 | + "222010":"参数格式错误", | |
70 | + "222011":"参数格式错误", | |
71 | + "222012":"参数格式错误", | |
72 | + "222013":"参数格式错误", | |
73 | + "222014":"参数格式错误", | |
74 | + "222015":"参数格式错误", | |
75 | + "222016":"参数格式错误", | |
76 | + "222017":"参数格式错误", | |
77 | + "222018":"参数格式错误", | |
78 | + "222019":"参数格式错误", | |
79 | + "222020":"参数格式错误", | |
80 | + "222021":"参数格式错误", | |
81 | + "222022":"身份证号不符合要求,备注:中国大陆身份证号的每一位数字都有其生成规则,不可随意填写。", | |
82 | + "222023":"参数格式错误", | |
83 | + "222024":"参数格式错误", | |
84 | + "222025":"参数格式错误", | |
85 | + "222026":"参数格式错误", | |
86 | + "222027":"验证码长度错误(最小值大于最大值)", | |
87 | + "222028":"参数格式错误", | |
88 | + "222029":"参数格式错误", | |
89 | + "222030":"参数格式错误", | |
90 | + "222039":"参数格式错误", | |
91 | + "222200":"该接口需使用application/json的格式进行请求", | |
92 | + "222201":"服务端请求失败", | |
93 | + "222202":"图片中没有人脸", | |
94 | + "222203":"无法解析人脸", | |
95 | + "222204":"从图片的url下载图片失败", | |
96 | + "222205":"服务端请求失败", | |
97 | + "222206":"服务端请求失败", | |
98 | + "222207":"未找到匹配的用户", | |
99 | + "222208":"图片的数量错误", | |
100 | + "222209":"face token不存在", | |
101 | + "222210":"人脸库中用户下的人脸数目超过限制", | |
102 | + "222300":"人脸图片添加失败", | |
103 | + "222301":"获取人脸图片失败", | |
104 | + "222302":"服务端请求失败", | |
105 | + "222303":"获取人脸图片失败", | |
106 | + "222152":"人脸属性编辑,target参数错误", | |
107 | + "222514":"人脸属性编辑v2调用服务失败,请重试", | |
108 | + "223100":"操作的用户组不存在", | |
109 | + "223101":"该用户组已存在", | |
110 | + "223102":"找不到该用户", | |
111 | + "223103":"找不到该用户", | |
112 | + "223104":"group_list包含组数量过多", | |
113 | + "223105":"该人脸已存在", | |
114 | + "223106":"该人脸不存在", | |
115 | + "223107":"人脸库中人脸复制时源组与目标组的scene_type不同", | |
116 | + "223110":"uid_list包含数量过多", | |
117 | + "223111":"目标用户组不存在", | |
118 | + "223112":"quality_conf格式不正确", | |
119 | + "223113":"人脸有被遮挡", | |
120 | + "223114":"人脸模糊", | |
121 | + "223115":"人脸光照不好", | |
122 | + "223116":"人脸不完整", | |
123 | + "223117":"app_list包含app数量过多", | |
124 | + "223118":"质量控制项错误", | |
125 | + "223119":"活体控制项错误", | |
126 | + "223120":"活体检测未通过", | |
127 | + "223121":"质量检测未通过 左眼遮挡程度过高", | |
128 | + "223122":"质量检测未通过 右眼遮挡程度过高", | |
129 | + "223123":"质量检测未通过 左脸遮挡程度过高", | |
130 | + "223124":"质量检测未通过 右脸遮挡程度过高", | |
131 | + "223125":"质量检测未通过 下巴遮挡程度过高", | |
132 | + "223126":"质量检测未通过 鼻子遮挡程度过高", | |
133 | + "223127":"质量检测未通过 嘴巴遮挡程度过高", | |
134 | + "222901":"参数校验初始化失败", | |
135 | + "222902":"参数校验初始化失败", | |
136 | + "222903":"参数校验初始化失败", | |
137 | + "222904":"参数校验初始化失败", | |
138 | + "222905":"接口初始化失败", | |
139 | + "222906":"接口初始化失败", | |
140 | + "222907":"缓存处理失败", | |
141 | + "222908":"缓存处理失败", | |
142 | + "222909":"缓存处理失败", | |
143 | + "222910":"数据存储处理失败", | |
144 | + "222911":"数据存储处理失败", | |
145 | + "222912":"数据存储处理失败", | |
146 | + "222913":"接口初始化失败", | |
147 | + "222914":"接口初始化失败", | |
148 | + "222915":"后端服务连接失败", | |
149 | + "222916":"后端服务连接失败", | |
150 | + "222304":"图片尺寸太大", | |
151 | + "222305":"当前版本不支持图片存储", | |
152 | + "223128":"正在清理该用户组的数据", | |
153 | + "223136":"该组内存在关联图片,无法新建相同名称组", | |
154 | + "222361":"公安服务连接失败", | |
155 | + "222046":"参数格式错误", | |
156 | + "222101":"参数格式错误", | |
157 | + "222102":"参数格式错误", | |
158 | + "222307":"图片非法 鉴黄未通过", | |
159 | + "222308":"图片非法 含有政治敏感人物", | |
160 | + "222211":"人脸融合失败 模板图质量不合格", | |
161 | + "222212":"人脸融合失败", | |
162 | + "223129":"人脸未面向正前方(人脸的角度信息大于30度)", | |
163 | + "223130":"spoofing_control参数格式错误", | |
164 | + "223131":"合成图检测未通过", | |
165 | + "223201":"请求参数scene_type 格式错误", | |
166 | + "223202":"识别时请求的scene_type与group设置的scene_type不匹配", | |
167 | + } | |
168 | + this.setData({err_map:map}); | |
169 | + }, | |
170 | + | |
171 | + /** | |
172 | + * 生命周期函数--监听页面显示 | |
173 | + */ | |
174 | + onShow: function (){ }, | |
175 | + | |
176 | + /** | |
177 | + * 生命周期函数--监听页面隐藏 | |
178 | + */ | |
179 | + onHide: function () { | |
180 | + | |
181 | + }, | |
182 | + | |
183 | + /** | |
184 | + * 生命周期函数--监听页面卸载 | |
185 | + */ | |
186 | + onUnload: function () { | |
187 | + | |
188 | + }, | |
189 | + | |
190 | + | |
191 | + /** | |
192 | + * 页面上拉触底事件的处理函数 | |
193 | + */ | |
194 | + onReachBottom: function () { | |
195 | + | |
196 | + }, | |
197 | + | |
198 | + analysis_img:function () { | |
199 | + var th=this; | |
200 | + var data={ | |
201 | + "appid": "25521854", | |
202 | + "image": getApp().globalData.face_SourceImg, | |
203 | + "face_field": "color,smooth,acnespotmole,wrinkle,eyesattr,blackheadpore,skinface,skinquality", | |
204 | + "image_type": "URL" | |
205 | + } | |
206 | + | |
207 | + //开始调用接口,进行分析 | |
208 | + getApp().request.json_post("/api/weshop/baidubce/face/skinAnalyze",data,function (res) { | |
209 | + if(res.data.code==0){ | |
210 | + wx.showToast({ | |
211 | + title: "分析成功", | |
212 | + icon: 'success', | |
213 | + duration: 2000 | |
214 | + }); | |
215 | + getApp().globalData.face_result=res.data.data; | |
216 | + }else{ | |
217 | + var msg=th.data.err_map[res.data.code+""]; | |
218 | + wx.showToast({ | |
219 | + title: msg, | |
220 | + icon: 'none', | |
221 | + duration: 2000 | |
222 | + }); | |
223 | + } | |
224 | + }) | |
225 | + } | |
226 | + | |
227 | + | |
228 | +}) | |
0 | 229 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/analyse/analyse.json
0 → 100644
packageB/pages/AI-test-skin/analyse/analyse.wxml
0 → 100644
1 | +<view class="content"> | |
2 | + <view class="img" style="margin-left: -38rpx"></view> | |
3 | + <view style="text-align: center;margin-top: -20%;"> | |
4 | + <text style="color: #fff;">正在分析...</text> | |
5 | + <progress border-radius="6" percent="{{per}}" activeColor="#fff" backgroundColor="#85898a" class="progress"></progress> | |
6 | + </view> | |
7 | +</view> | ... | ... |
packageB/pages/AI-test-skin/analyse/analyse.wxss
0 → 100644
1 | +/* packageB/pages/AI-test-skin/analyse/analyse.wxss */ | |
2 | +page { | |
3 | + width: 100%; | |
4 | + height: 100%; | |
5 | +} | |
6 | + | |
7 | +.content { | |
8 | + /* display: flex; | |
9 | + flex-direction: column; | |
10 | + align-items: center; */ | |
11 | + background: #515658; | |
12 | + width: 100%; | |
13 | + height: 100%; | |
14 | + | |
15 | +} | |
16 | + | |
17 | +@keyframes mymove { | |
18 | + from { | |
19 | + background-position: 0, 0; | |
20 | + } | |
21 | + | |
22 | + to { | |
23 | + background-position: -9450px 0; | |
24 | + } | |
25 | +} | |
26 | + | |
27 | +.img { | |
28 | + background: url("https://mshopimg.yolipai.net//miniapp/images/skinimg/11.png"); | |
29 | + margin-top: 15%; | |
30 | + display: inline-block; | |
31 | + width: 350px; | |
32 | + height: 350px; | |
33 | + transform: scale(0.55); | |
34 | + animation: 1s mymove infinite steps(27, end); | |
35 | +} | |
36 | + | |
37 | +.progress { | |
38 | + margin-top: 3%; | |
39 | + width: 60%; | |
40 | + /* text-align: center; */ | |
41 | + margin-left: 50%; | |
42 | + transform: translateX(-50%); | |
43 | +} | |
0 | 44 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/fail_result/fail_result.js
0 → 100644
1 | +// packageB/pages/AI-test-skin/fail_result/fail_result.js | |
2 | +Page({ | |
3 | + | |
4 | + /** | |
5 | + * 页面的初始数据 | |
6 | + */ | |
7 | + data: { | |
8 | + | |
9 | + }, | |
10 | + | |
11 | + /** | |
12 | + * 生命周期函数--监听页面加载 | |
13 | + */ | |
14 | + onLoad: function (options) { | |
15 | + | |
16 | + }, | |
17 | + | |
18 | + /** | |
19 | + * 生命周期函数--监听页面初次渲染完成 | |
20 | + */ | |
21 | + onReady: function () { | |
22 | + | |
23 | + }, | |
24 | + | |
25 | + /** | |
26 | + * 生命周期函数--监听页面显示 | |
27 | + */ | |
28 | + onShow: function () { | |
29 | + | |
30 | + }, | |
31 | + | |
32 | + /** | |
33 | + * 生命周期函数--监听页面隐藏 | |
34 | + */ | |
35 | + onHide: function () { | |
36 | + | |
37 | + }, | |
38 | + | |
39 | + /** | |
40 | + * 生命周期函数--监听页面卸载 | |
41 | + */ | |
42 | + onUnload: function () { | |
43 | + | |
44 | + }, | |
45 | + | |
46 | + /** | |
47 | + * 页面相关事件处理函数--监听用户下拉动作 | |
48 | + */ | |
49 | + onPullDownRefresh: function () { | |
50 | + | |
51 | + }, | |
52 | + | |
53 | + /** | |
54 | + * 页面上拉触底事件的处理函数 | |
55 | + */ | |
56 | + onReachBottom: function () { | |
57 | + | |
58 | + }, | |
59 | + | |
60 | + /** | |
61 | + * 用户点击右上角分享 | |
62 | + */ | |
63 | + onShareAppMessage: function () { | |
64 | + | |
65 | + } | |
66 | +}) | |
0 | 67 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/fail_result/fail_result.json
0 → 100644
packageB/pages/AI-test-skin/fail_result/fail_result.wxml
0 → 100644
packageB/pages/AI-test-skin/fail_result/fail_result.wxss
0 → 100644
packageB/pages/AI-test-skin/history_record/history_record.js
0 → 100644
1 | +// packageB/pages/AI-test-skin/history_record/history_record.js | |
2 | +Page({ | |
3 | + | |
4 | + /** | |
5 | + * 页面的初始数据 | |
6 | + */ | |
7 | + data: { | |
8 | + | |
9 | + }, | |
10 | + | |
11 | + /** | |
12 | + * 生命周期函数--监听页面加载 | |
13 | + */ | |
14 | + onLoad: function (options) { | |
15 | + | |
16 | + }, | |
17 | + | |
18 | + /** | |
19 | + * 生命周期函数--监听页面初次渲染完成 | |
20 | + */ | |
21 | + onReady: function () { | |
22 | + | |
23 | + }, | |
24 | + | |
25 | + /** | |
26 | + * 生命周期函数--监听页面显示 | |
27 | + */ | |
28 | + onShow: function () { | |
29 | + | |
30 | + }, | |
31 | + | |
32 | + /** | |
33 | + * 生命周期函数--监听页面隐藏 | |
34 | + */ | |
35 | + onHide: function () { | |
36 | + | |
37 | + }, | |
38 | + | |
39 | + /** | |
40 | + * 生命周期函数--监听页面卸载 | |
41 | + */ | |
42 | + onUnload: function () { | |
43 | + | |
44 | + }, | |
45 | + | |
46 | + /** | |
47 | + * 页面相关事件处理函数--监听用户下拉动作 | |
48 | + */ | |
49 | + onPullDownRefresh: function () { | |
50 | + | |
51 | + }, | |
52 | + | |
53 | + /** | |
54 | + * 页面上拉触底事件的处理函数 | |
55 | + */ | |
56 | + onReachBottom: function () { | |
57 | + | |
58 | + }, | |
59 | + | |
60 | + /** | |
61 | + * 用户点击右上角分享 | |
62 | + */ | |
63 | + onShareAppMessage: function () { | |
64 | + | |
65 | + } | |
66 | +}) | |
0 | 67 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/history_record/history_record.json
0 → 100644
packageB/pages/AI-test-skin/history_record/history_record.wxml
0 → 100644
packageB/pages/AI-test-skin/history_record/history_record.wxss
0 → 100644
packageB/pages/AI-test-skin/index/aiskin.wxml
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | <cover-view style="padding: 0 6rpx 0 25rpx;" bindtap="goto" data-url="/packageB/pages/AI-test-skin/history_record/history_record">历史档案</cover-view> |
4 | 4 | <text class="iconfont icon-arrow_right"></text> |
5 | 5 | </view> |
6 | - <image src="{{iurl}}/miniapp/images/skinimg/3.jpeg "></image> | |
6 | + <image src="{{iurl}}/miniapp/images/skinimg/3.jpeg"></image> | |
7 | 7 | <view class="start_btn" bindtap="goto" data-url="/packageB/pages/AI-test-skin/shoot_notice/shoot_notice"> |
8 | 8 | <text>开始测肤</text> |
9 | 9 | </view> | ... | ... |
packageB/pages/AI-test-skin/select_photo/select_photo.js
0 → 100644
1 | +/* | |
2 | + * @Author: your name | |
3 | + * @Date: 2022-02-16 14:34:42 | |
4 | + * @LastEditTime: 2022-02-16 15:42:25 | |
5 | + * @LastEditors: Please set LastEditors | |
6 | + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | |
7 | + * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\select_photo\select_photo.js | |
8 | + */ | |
9 | +// packageB/pages/AI-test-skin/select_photo/select_photo.js | |
10 | +const app = getApp(); | |
11 | +const request = app.request; | |
12 | +const os = app.globalData; | |
13 | +const setting = os.setting; | |
14 | +const ut = require('../../../../utils/util'); | |
15 | +Page({ | |
16 | + | |
17 | + /** | |
18 | + * 页面的初始数据 | |
19 | + */ | |
20 | + data: { | |
21 | + iurl: setting.imghost, | |
22 | + gl_skin_img: null, | |
23 | + }, | |
24 | + | |
25 | + /** | |
26 | + * 生命周期函数--监听页面加载 | |
27 | + */ | |
28 | + onLoad: function (options) { | |
29 | + var img=getApp().globalData.skin_img; | |
30 | + this.setData({gl_skin_img:img}) | |
31 | + }, | |
32 | + | |
33 | + /** | |
34 | + * 生命周期函数--监听页面显示 | |
35 | + */ | |
36 | + onShow: function () {}, | |
37 | + | |
38 | + /** | |
39 | + * 生命周期函数--监听页面隐藏 | |
40 | + */ | |
41 | + onHide: function () { | |
42 | + | |
43 | + }, | |
44 | + /** | |
45 | + * 页面上拉触底事件的处理函数 | |
46 | + */ | |
47 | + onReachBottom: function () { | |
48 | + | |
49 | + }, | |
50 | + | |
51 | + /** | |
52 | + * 用户点击右上角分享 | |
53 | + */ | |
54 | + onShareAppMessage: function () { | |
55 | + | |
56 | + }, | |
57 | + | |
58 | + //-- 完成选择 -- | |
59 | + ok_select:function () { | |
60 | + var th=this; | |
61 | + app.request.uploadFile("/api/weshop/baidubce/face/uploadImg?uploadPath=faceimg&storeId="+setting.stoid, { | |
62 | + filePath: th.data.gl_skin_img, | |
63 | + name: "file", | |
64 | + success: function (e) { | |
65 | + if(e.data.code==0) { | |
66 | + getApp().globalData.face_img=e.data.data.img; | |
67 | + getApp().globalData.face_SourceImg=e.data.data.SourceImg; | |
68 | + | |
69 | + let url = "/packageB/pages/AI-test-skin/analyse/analyse"; //跳到分析页 | |
70 | + app.goto(url); | |
71 | + | |
72 | + } else { | |
73 | + wx.showToast({ | |
74 | + title: e.data.msg, | |
75 | + icon: 'success', | |
76 | + duration: 2000 | |
77 | + }); | |
78 | + }; | |
79 | + } | |
80 | + }); | |
81 | + }, | |
82 | + | |
83 | + //-- 重新从相册中选择图片 -- | |
84 | + show_pai_pop:function () { | |
85 | + var th=this; | |
86 | + //选择和拍照一张图片 | |
87 | + wx.chooseImage({ | |
88 | + count: 1, | |
89 | + sizeType: ['original', 'compressed'], | |
90 | + sourceType: ['album', 'camera'], | |
91 | + success (res) { | |
92 | + let imgArr = res.tempFilePaths; | |
93 | + getApp().globalData.skin_img=imgArr[0]; | |
94 | + th.setData({gl_skin_img:imgArr[0]}) | |
95 | + } | |
96 | + }) | |
97 | + | |
98 | + }, | |
99 | + | |
100 | + | |
101 | + | |
102 | + | |
103 | +}) | |
0 | 104 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/select_photo/select_photo.json
0 → 100644
packageB/pages/AI-test-skin/select_photo/select_photo.wxml
0 → 100644
1 | +<view class="content" style="height: 70%;"> | |
2 | + <view style="height: 100%;"> | |
3 | + <image style="height: 100%;width: 100%;border-radius: 3%;" src="{{gl_skin_img}}"></image> | |
4 | + </view> | |
5 | + <view class="foot_btn"> | |
6 | + <view class="reset_select" bindtap="show_pai_pop"> | |
7 | + <text class="iconfont icon-zuojiantou" style="font-size: 40rpx"></text> | |
8 | + <text style="font-size: 28rpx">重拍</text> | |
9 | + </view> | |
10 | + <view class="ok_btn" bindtap="ok_select"> | |
11 | + <text class="iconfont icon-dagou" style="margin-right: 10rpx"></text> | |
12 | + <text>完成</text> | |
13 | + </view> | |
14 | + </view> | |
15 | +</view> | ... | ... |
packageB/pages/AI-test-skin/select_photo/select_photo.wxss
0 → 100644
1 | +/* packageB/pages/AI-test-skin/select_photo/select_photo.wxss */ | |
2 | +page { | |
3 | + width: 100%; | |
4 | + height: 100%; | |
5 | +} | |
6 | + | |
7 | +.content { | |
8 | + padding: 10%; | |
9 | + height: 60%; | |
10 | +} | |
11 | + | |
12 | +.foot_btn { | |
13 | + margin-top: 80rpx; | |
14 | + display: flex; | |
15 | + justify-content: space-between; | |
16 | + align-items: center; | |
17 | +} | |
18 | + | |
19 | +.foot_btn .reset_select { | |
20 | + display: flex; | |
21 | + flex-direction: column; | |
22 | +} | |
23 | + | |
24 | +.foot_btn .ok_btn { | |
25 | + background: #5dd9dc; | |
26 | + padding: 0 50rpx; | |
27 | + border-radius: 50rpx; | |
28 | + /* margin: 0 auto; */ | |
29 | + line-height: 100rpx; | |
30 | + color: #fff; | |
31 | +} | ... | ... |
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js
1 | +/* | |
2 | + * @Author: your name | |
3 | + * @Date: 2022-02-15 10:01:57 | |
4 | + * @LastEditTime: 2022-02-16 15:40:54 | |
5 | + * @LastEditors: Please set LastEditors | |
6 | + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AEet urkl | |
7 | + * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\shoot_notice\shoot_notice.js | |
8 | + */ | |
1 | 9 | // packageB/pages/AI-test-skin/shoot_notice/shoot_notice.js |
2 | 10 | const app = getApp(); |
3 | 11 | const request = app.request; |
... | ... | @@ -21,13 +29,6 @@ Page({ |
21 | 29 | }, |
22 | 30 | |
23 | 31 | /** |
24 | - * 生命周期函数--监听页面初次渲染完成 | |
25 | - */ | |
26 | - onReady: function () { | |
27 | - | |
28 | - }, | |
29 | - | |
30 | - /** | |
31 | 32 | * 生命周期函数--监听页面显示 |
32 | 33 | */ |
33 | 34 | onShow: function () { |
... | ... | @@ -42,13 +43,6 @@ Page({ |
42 | 43 | }, |
43 | 44 | |
44 | 45 | /** |
45 | - * 生命周期函数--监听页面卸载 | |
46 | - */ | |
47 | - onUnload: function () { | |
48 | - | |
49 | - }, | |
50 | - | |
51 | - /** | |
52 | 46 | * 页面相关事件处理函数--监听用户下拉动作 |
53 | 47 | */ |
54 | 48 | onPullDownRefresh: function () { |
... | ... | @@ -67,5 +61,26 @@ Page({ |
67 | 61 | */ |
68 | 62 | onShareAppMessage: function () { |
69 | 63 | |
70 | - } | |
64 | + }, | |
65 | + | |
66 | + //从相册中选择图片 | |
67 | + show_pai_pop:function () { | |
68 | + //选择和拍照一张图片 | |
69 | + wx.chooseImage({ | |
70 | + count: 1, | |
71 | + sizeType: ['original', 'compressed'], | |
72 | + sourceType: ['album', 'camera'], | |
73 | + success (res) { | |
74 | + let imgArr = res.tempFilePaths; | |
75 | + getApp().globalData.skin_img=imgArr[0]; | |
76 | + let url = "/packageB/pages/AI-test-skin/select_photo/select_photo"; | |
77 | + app.goto(url); | |
78 | + } | |
79 | + }) | |
80 | + | |
81 | + }, | |
82 | + | |
83 | + | |
84 | + | |
85 | + | |
71 | 86 | }) |
72 | 87 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxml
... | ... | @@ -51,9 +51,7 @@ |
51 | 51 | </view> |
52 | 52 | <view style="height: 300rpx;background-color: #e7f5fb;"> |
53 | 53 | <view class="btn_fixed"> |
54 | - <view class="btn"> | |
55 | - 准备闭眼拍摄 | |
56 | - </view> | |
54 | + <view class="btn" bindtap="show_pai_pop">准备闭眼拍摄</view> | |
57 | 55 | <view class="notice" style="display:flex;justify-content:center;align-items: center;"> |
58 | 56 | <text class="iconfont icon-info" style="margin-right: 10rpx;font-size: 26rpx"></text> |
59 | 57 | <text>如无闭眼,将导致图片分析失败</text> | ... | ... |
packageB/pages/AI-test-skin/shoot_notice/shoot_notice.wxss
... | ... | @@ -2,11 +2,11 @@ |
2 | 2 | page { |
3 | 3 | width: 100vw; |
4 | 4 | height: 100%; |
5 | - padding: 40rpx 30rpx 0 30rpx; | |
5 | + /*padding: 40rpx 30rpx 0 30rpx;*/ | |
6 | 6 | box-sizing: border-box; |
7 | 7 | background-color: #e7f5fb; |
8 | 8 | } |
9 | - | |
9 | +.page_set{padding: 40rpx 30rpx 0 30rpx;} | |
10 | 10 | .content { |
11 | 11 | width: 100%; |
12 | 12 | /* height: 100%; */ |
... | ... | @@ -90,4 +90,45 @@ page { |
90 | 90 | text-align: center; |
91 | 91 | color: red; |
92 | 92 | font-size: 28rpx; |
93 | -} | |
94 | 93 | \ No newline at end of file |
94 | +} | |
95 | + | |
96 | +.cover-layer { | |
97 | + position: fixed; | |
98 | + left: 0; | |
99 | + top: 0; | |
100 | + right: 0; | |
101 | + bottom: 0; | |
102 | + z-index: 11; | |
103 | + background: rgba(0,0,0,0.4); | |
104 | + width: 100%; | |
105 | + height: 100%; | |
106 | +} | |
107 | + | |
108 | +.flex{display: flex} | |
109 | +.jc-center{ | |
110 | + justify-content: center; | |
111 | +} | |
112 | +.ac{align-items: center} | |
113 | +.pai_content{ | |
114 | + position: fixed;z-index: 100;bottom: 0;background: #FFFFFF;width: 100%; | |
115 | + border-top-left-radius:30rpx; | |
116 | + border-top-right-radius:30rpx; | |
117 | +} | |
118 | +.p_item{ height: 100rpx; line-height: 100rpx;text-align: center; border-bottom: 1rpx solid #eee} | |
119 | +.p_cancle{height: 100rpx; line-height: 100rpx;text-align: center; border-top:20rpx solid #f8f8f8;} | |
120 | + | |
121 | +@keyframes p_up | |
122 | +{ | |
123 | + from {transform:translateY(100%);} | |
124 | + to {transform:translateY(0);} | |
125 | +} | |
126 | + | |
127 | +@keyframes p_down | |
128 | +{ | |
129 | + from {transform:translateY(0);} | |
130 | + to {transform:translateY(100%);} | |
131 | +} | |
132 | +.p_to_up{animation:p_up 1s;} | |
133 | +.p_to_down{animation:p_down 0.5s;} | |
134 | + | |
135 | + | ... | ... |
packageB/pages/AI-test-skin/success_result/success_result.js
0 → 100644
1 | +// packageB/pages/AI-test-skin/success_result/success_result.js | |
2 | +Page({ | |
3 | + | |
4 | + /** | |
5 | + * 页面的初始数据 | |
6 | + */ | |
7 | + data: { | |
8 | + | |
9 | + }, | |
10 | + | |
11 | + /** | |
12 | + * 生命周期函数--监听页面加载 | |
13 | + */ | |
14 | + onLoad: function (options) { | |
15 | + | |
16 | + }, | |
17 | + | |
18 | + /** | |
19 | + * 生命周期函数--监听页面初次渲染完成 | |
20 | + */ | |
21 | + onReady: function () { | |
22 | + | |
23 | + }, | |
24 | + | |
25 | + /** | |
26 | + * 生命周期函数--监听页面显示 | |
27 | + */ | |
28 | + onShow: function () { | |
29 | + | |
30 | + }, | |
31 | + | |
32 | + /** | |
33 | + * 生命周期函数--监听页面隐藏 | |
34 | + */ | |
35 | + onHide: function () { | |
36 | + | |
37 | + }, | |
38 | + | |
39 | + /** | |
40 | + * 生命周期函数--监听页面卸载 | |
41 | + */ | |
42 | + onUnload: function () { | |
43 | + | |
44 | + }, | |
45 | + | |
46 | + /** | |
47 | + * 页面相关事件处理函数--监听用户下拉动作 | |
48 | + */ | |
49 | + onPullDownRefresh: function () { | |
50 | + | |
51 | + }, | |
52 | + | |
53 | + /** | |
54 | + * 页面上拉触底事件的处理函数 | |
55 | + */ | |
56 | + onReachBottom: function () { | |
57 | + | |
58 | + }, | |
59 | + | |
60 | + /** | |
61 | + * 用户点击右上角分享 | |
62 | + */ | |
63 | + onShareAppMessage: function () { | |
64 | + | |
65 | + } | |
66 | +}) | |
0 | 67 | \ No newline at end of file | ... | ... |
packageB/pages/AI-test-skin/success_result/success_result.json
0 → 100644
packageB/pages/AI-test-skin/success_result/success_result.wxml
0 → 100644
packageB/pages/AI-test-skin/success_result/success_result.wxss
0 → 100644
pages/user/index/index.js
... | ... | @@ -60,7 +60,7 @@ Page({ |
60 | 60 | onLoad: function(options) { |
61 | 61 | var th=this; |
62 | 62 | //-- 读取会员中心按钮列表 -- |
63 | - getApp().request.get("/api/weshop/userTool/page?pageSize=100", { | |
63 | + getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { | |
64 | 64 | success:function(res){ |
65 | 65 | if(ut.ajax_ok(res)) { |
66 | 66 | var d_list=res.data.data.pageData; | ... | ... |