wxd / MShopWeApp

Commit 98d92dc290b044f32d67b532e3c279f3910d48b2

Authored by WXD-SEASON\season
1 parent a9818af9

会员标签及会员成长值移到E包

Inline Side-by-side
Showing 16 changed files with 17 additions and 16 deletions
app.json
  View file @98d92dc
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 "pages/user/userqy/userqy", 34 "pages/user/userqy/userqy",
35 "pages/user/user_spsy/user_spsy", 35 "pages/user/user_spsy/user_spsy",
36 36
37 - "pages/user/grow_value/grow_value", 37 +
38 "pages/payment/pay_success/pay_success", 38 "pages/payment/pay_success/pay_success",
39 "pages/user/plus/plus", 39 "pages/user/plus/plus",
40 40
@@ -45,8 +45,7 @@ @@ -45,8 +45,7 @@
45 "pages/user/my_service/tment_details", 45 "pages/user/my_service/tment_details",
46 "pages/user/my_service/tment_eval", 46 "pages/user/my_service/tment_eval",
47 "pages/user/my_service/tment_order_list", 47 "pages/user/my_service/tment_order_list",
48 - "pages/user/my_service/beauty_deta",  
49 - "pages/user/labels/labels", 48 + "pages/user/my_service/beauty_deta",
50 "pages/giftpack/birthdaygift/birthdaygift", 49 "pages/giftpack/birthdaygift/birthdaygift",
51 "pages/giftpack/evaluategift/evaluategift", 50 "pages/giftpack/evaluategift/evaluategift",
52 "pages/giftpack/newvipgift/newvipgift", 51 "pages/giftpack/newvipgift/newvipgift",
@@ -122,7 +121,7 @@ @@ -122,7 +121,7 @@
122 "pages/serviceCard_pd/team_success/team_success" 121 "pages/serviceCard_pd/team_success/team_success"
123 ], 122 ],
124 123
125 - "plugins":{"live-player-plugin":{"version":"1.3.2","provider":"wx2b03c6e691cd7370"}} 124 + "plugins":{"live-player-plugin":{"version":"1.3.5","provider":"wx2b03c6e691cd7370"}}
126 }, 125 },
127 { 126 {
128 "root": "packageB/", 127 "root": "packageB/",
@@ -213,7 +212,9 @@ @@ -213,7 +212,9 @@
213 "pages/user/cardinfo/cardinfo", 212 "pages/user/cardinfo/cardinfo",
214 "pages/user/nick_avatar/nick_avatar", 213 "pages/user/nick_avatar/nick_avatar",
215 "pages/user/slimming/slimming", 214 "pages/user/slimming/slimming",
216 - "pages/user/punchInhistory/punchInhistory" 215 + "pages/user/punchInhistory/punchInhistory",
  216 + "pages/user/grow_value/grow_value",
  217 + "pages/user/labels/labels"
217 ] 218 ]
218 } 219 }
219 220
packageA/pages/profile/profile.wxml
  View file @98d92dc
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 <!-- 我的兴趣 --> 149 <!-- 我的兴趣 -->
150 <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom"> 150 <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom">
151 <view class="interest fs28"> 151 <view class="interest fs28">
152 - <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels"> 152 + <view class="flex-vertical-between" bindtap="goto" data-url="/packageE/pages/user/labels/labels">
153 <view class="fs30">我的兴趣</view> 153 <view class="fs30">我的兴趣</view>
154 <view class="angle">∟</view> 154 <view class="angle">∟</view>
155 </view> 155 </view>
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 </view> 161 </view>
162 </block> 162 </block>
163 <!-- 添加标签按钮 --> 163 <!-- 添加标签按钮 -->
164 - <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/pages/user/labels/labels"> 164 + <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/packageE/pages/user/labels/labels">
165 <text class="plus">+</text> 165 <text class="plus">+</text>
166 <text>标签</text> 166 <text>标签</text>
167 </view> 167 </view>
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @98d92dc
@@ -1282,7 +1282,7 @@ Page({ @@ -1282,7 +1282,7 @@ Page({
1282 break; 1282 break;
1283 }; 1283 };
1284 case 2: { 1284 case 2: {
1285 - url = '/pages/user/grow_value/grow_value'; 1285 + url = '/packageE/pages/user/grow_value/grow_value';
1286 break; 1286 break;
1287 }; 1287 };
1288 case 3: { 1288 case 3: {
packageD/components/diy_login/login.wxml
  View file @98d92dc
@@ -215,7 +215,7 @@ @@ -215,7 +215,7 @@
215 <!-- 我的兴趣 --> 215 <!-- 我的兴趣 -->
216 <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom"> 216 <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom">
217 <view class="interest fs28"> 217 <view class="interest fs28">
218 - <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels"> 218 + <view class="flex-vertical-between" bindtap="goto" data-url="/packageE/pages/user/labels/labels">
219 <view class="fs30">我的兴趣</view> 219 <view class="fs30">我的兴趣</view>
220 <view class="angle">∟</view> 220 <view class="angle">∟</view>
221 </view> 221 </view>
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
227 </view> 227 </view>
228 </block> 228 </block>
229 <!-- 添加标签按钮 --> 229 <!-- 添加标签按钮 -->
230 - <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/pages/user/labels/labels"> 230 + <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/packageE/pages/user/labels/labels">
231 <text class="plus">+</text> 231 <text class="plus">+</text>
232 <text>标签</text> 232 <text>标签</text>
233 </view> 233 </view>
pages/user/grow_value/filter.wxs renamed to packageE/pages/user/grow_value/filter.wxs
  View file @98d92dc
pages/user/grow_value/grow_value.js renamed to packageE/pages/user/grow_value/grow_value.js
  View file @98d92dc
1 var e = getApp(),os = e.globalData.setting; 1 var e = getApp(),os = e.globalData.setting;
2 -var utils = require('../../../utils/util.js');  
3 -var regeneratorRuntime = require('../../../utils/runtime.js'); 2 +var utils = require('../../../../utils/util.js');
  3 +var regeneratorRuntime = require('../../../../utils/runtime.js');
4 4
5 Page({ 5 Page({
6 /*** 页面的初始数据*/ 6 /*** 页面的初始数据*/
pages/user/grow_value/grow_value.json renamed to packageE/pages/user/grow_value/grow_value.json
  View file @98d92dc
pages/user/grow_value/grow_value.wxml renamed to packageE/pages/user/grow_value/grow_value.wxml
  View file @98d92dc
pages/user/grow_value/grow_value.wxss renamed to packageE/pages/user/grow_value/grow_value.wxss
  View file @98d92dc
pages/user/labels/labels.js renamed to packageE/pages/user/labels/labels.js
  View file @98d92dc
pages/user/labels/labels.json renamed to packageE/pages/user/labels/labels.json
  View file @98d92dc
pages/user/labels/labels.wxml renamed to packageE/pages/user/labels/labels.wxml
  View file @98d92dc
pages/user/labels/labels.wxss renamed to packageE/pages/user/labels/labels.wxss
  View file @98d92dc
pages/user/index/index.js
  View file @98d92dc
@@ -822,7 +822,7 @@ Page({ @@ -822,7 +822,7 @@ Page({
822 }, 822 },
823 823
824 jump: function () { 824 jump: function () {
825 - getApp().goto("/pages/user/grow_value/grow_value") 825 + getApp().goto("/packageE/pages/user/grow_value/grow_value")
826 }, 826 },
827 // 判断生日营销的页面是不是存在 827 // 判断生日营销的页面是不是存在
828 birthday: function () { 828 birthday: function () {
pages/user/userinfo/userinfo.wxml
  View file @98d92dc
@@ -246,7 +246,7 @@ @@ -246,7 +246,7 @@
246 <!-- 我的兴趣 --> 246 <!-- 我的兴趣 -->
247 <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom"> 247 <view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom">
248 <view class="interest fs28"> 248 <view class="interest fs28">
249 - <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels"> 249 + <view class="flex-vertical-between" bindtap="goto" data-url="/packageE/pages/user/labels/labels">
250 <view class="fs30">我的兴趣</view> 250 <view class="fs30">我的兴趣</view>
251 <view class="angle">∟</view> 251 <view class="angle">∟</view>
252 </view> 252 </view>
@@ -258,7 +258,7 @@ @@ -258,7 +258,7 @@
258 </view> 258 </view>
259 </block> 259 </block>
260 <!-- 添加标签按钮 --> 260 <!-- 添加标签按钮 -->
261 - <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/pages/user/labels/labels"> 261 + <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/packageE/pages/user/labels/labels">
262 <text class="plus">+</text> 262 <text class="plus">+</text>
263 <text>标签</text> 263 <text>标签</text>
264 </view> 264 </view>
pages/user/userqy/userqy.js
  View file @98d92dc
@@ -218,7 +218,7 @@ Page({ @@ -218,7 +218,7 @@ Page({
218 }, 218 },
219 219
220 go_cz:function(){ 220 go_cz:function(){
221 - getApp().goto("/pages/user/grow_value/grow_value") 221 + getApp().goto("/packageE/pages/user/grow_value/grow_value")
222 }, 222 },
223 223
224 //获取卡类的gr_id 224 //获取卡类的gr_id