wxd / MShopWeApp

Commit 142b2a595be76bd205d71b3e6ef35d0a1b8ba769

Authored by 后端研发-苏明海
2 parents e1d2784b a43c2212

Merge branch 'dev' into 'test' 

Dev

See merge request !589
Inline Side-by-side
Showing 10 changed files with 85 additions and 298 deletions
app.json
  View file @142b2a5
1 1 {
2 2 "pages": [
3 3 "pages/index/index/index",
4   - "pages/justTest/justTest",
5 4 "pages/goods/categoryList/categoryList",
6 5 "pages/cart/cart/cart",
7 6 "pages/cart/cart2/cart2",
... ... @@ -86,11 +85,18 @@
86 85 "pages/video/index",
87 86 "pages/template/index",
88 87 "pages/store/index",
89   - "pages/user/choice_guide/choice_guide"
  88 + "pages/user/choice_guide/choice_guide",
  89 + "pages/cart/cart2_inte/cart2_inte",
  90 + "pages/giftpack/festival/festival",
  91 + "pages/team/team_more/team_more",
  92 + "pages/user/collect_list/collect_list",
  93 + "pages/user/deposit/deposit",
  94 + "pages/user/deposit/prepaid/msg/msg",
  95 + "pages/user/deposit/prepaid/prepaid"
90 96 ],
91 97 "plugins": {
92 98 "live-player-plugin": {
93   - "version": "1.1.1",
  99 + "version": "1.2.1",
94 100 "provider": "wx2b03c6e691cd7370"
95 101 }
96 102 },
... ...
components/diy_shopname/diy_shopname.wxml
  View file @142b2a5
... ... @@ -3,18 +3,20 @@
3 3 <view class="big">
4 4  
5 5 <view class="big_picture_border">
6   - <image class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image>
  6 + <image mode="widthFix" style="display: block;" class="big_picture" src='{{object.srcimg}}' binderror="berror" data-err="object.srcimg"></image>
7 7 </view>
8 8 <block wx:if="{{object.style==1}}">
9 9  
10   - <view class="big_border">
  10 + <view style="position: relative; height: 150rpx;">
  11 + <view class="big_border" >
11 12 <view class="circle">
12 13 <view class="border">
13   - <image class="wxd_ww" src='{{sto}}' bindtap="go_user"></image>
  14 + <image class="wxd_ww" src='{{sto}}' bindtap="go_user"></image>
14 15 </view>
15 16 </view>
16 17 <view class="font">{{store_name}}</view>
17 18 </view>
  19 + </view>
18 20  
19 21 <view class="all_view">
20 22 <view class="v_item" bindtap="go_all_wares">
... ... @@ -36,8 +38,7 @@
36 38 </view>
37 39 </block>
38 40  
39   -
40   - <block wx:else="{{object.style==2}}">
  41 + <block wx:if="{{object.style==2}}">
41 42 <view class="big_border_two">
42 43 <view class="circle_tow">
43 44 <view class="border">
... ... @@ -48,35 +49,38 @@
48 49 <view class="fonts">{{store_name}}</view>
49 50 </view>
50 51 </view>
51   - <view class="base_font">
52   - <view class="arrange">
53   - <view class="base_font_one">
54   - <navigator url="/pages/goods/goodsList/goodsList" class="navi">
55   - <view>{{total}}</view>
56   - <view>全部商品</view>
57   - </navigator>
58   - </view>
59   -
60   - <view class="base_font_one">
61   - <view class="shuxian">|</view>
62   - <navigator url="/pages/goods/goodsList/goodsList?is_new=1" class="navi">
63   - <view>{{new_total}}</view>
64   - <view>上新商品</view>
65   - </navigator>
66   - </view>
67   -
68   - <view class="base_font_one" bindtap="go_user">
69   - <view class="shuxian">|</view>
70   - <view class="navi">
71   - <view >
72   - <image class="user_pictrue_two" src='{{imghost}}/miniapp/images/numb.png'></image>
73   - </view>
74   - <view>个人中心</view>
75   - </view>
76   - </view>
77   - </view>
78   - </view>
79 52 </block>
80 53 </view>
  54 +
  55 + <block wx:if="{{object.style==2}}">
  56 + <view class="base_font">
  57 + <view class="arrange">
  58 + <view class="base_font_one">
  59 + <navigator url="/pages/goods/goodsList/goodsList" class="navi">
  60 + <view>{{total}}</view>
  61 + <view>全部商品</view>
  62 + </navigator>
  63 + </view>
  64 +
  65 + <view class="base_font_one">
  66 + <view class="shuxian">|</view>
  67 + <navigator url="/pages/goods/goodsList/goodsList?is_new=1" class="navi">
  68 + <view>{{new_total}}</view>
  69 + <view>上新商品</view>
  70 + </navigator>
  71 + </view>
  72 +
  73 + <view class="base_font_one" bindtap="go_user">
  74 + <view class="shuxian">|</view>
  75 + <view class="navi">
  76 + <view >
  77 + <image class="user_pictrue_two" src='{{imghost}}/miniapp/images/numb.png'></image>
  78 + </view>
  79 + <view>个人中心</view>
  80 + </view>
  81 + </view>
  82 + </view>
  83 + </view>
  84 + </block>
81 85 </view>
82 86  
... ...
components/diy_shopname/diy_shopname.wxss
  View file @142b2a5
... ... @@ -4,7 +4,7 @@
4 4 text-align:center;
5 5 margin:0 auto;
6 6 position: relative;
7   - height: 500rpx;
  7 + /* height: 500rpx; */
8 8 }
9 9  
10 10 .s1_gk_a1{
... ... @@ -15,11 +15,9 @@
15 15  
16 16 /* 圆形小图片 */
17 17 .wxd_ww {
18   - width: 126rpx;
19   - height: 126rpx;
  18 + width: 100%;
  19 + height: 100%;
20 20 /* justify-content: center; */
21   - margin-top: 20rpx;
22   - margin-left: 6rpx;
23 21 }
24 22  
25 23 /* 小图片圆边框 */
... ... @@ -43,8 +41,8 @@
43 41 /* 设置小图片外面的view的宽高 */
44 42  
45 43 .circle_tow .border {
46   - width: 140rpx;
47   - height: 140rpx;
  44 + width: 100%;
  45 + height: 100%;
48 46 }
49 47  
50 48 /* 小图片最大外边框 */
... ... @@ -52,7 +50,7 @@
52 50 .big_border {
53 51 width: 192rpx;
54 52 height: 214rpx;
55   - position: relative;
  53 + position: absolute;
56 54 top: -82rpx;
57 55 left: 10px;
58 56 }
... ... @@ -69,7 +67,7 @@
69 67  
70 68 .big_picture_border {
71 69 width: 100%;
72   - height: 320rpx;
  70 + /* height: 320rpx; */
73 71 }
74 72  
75 73  
... ... @@ -140,9 +138,10 @@ left:-116rpx;
140 138 .big_border_two {
141 139 width: 100%;
142 140 height: 260rpx;
143   - position: relative;
144   - top: -274rpx;
  141 + position: absolute;
  142 + top: -130rpx;
145 143 text-align: center;
  144 + margin-top: 50%;
146 145 }
147 146  
148 147 /* 小图片2圆边框 */
... ... @@ -189,7 +188,6 @@ left:-116rpx;
189 188 width: 100%;
190 189 height: 120rpx;
191 190 position: relative;
192   - top: -250rpx;
193 191 }
194 192 /* 使里面的view纵向排列 */
195 193 .arrange{
... ... @@ -223,11 +221,11 @@ left:-116rpx;
223 221 }
224 222 .wai_zwp{
225 223 background-color: white;
226   - height: 500rpx;
  224 + /* height: 500rpx; */
227 225 }
228 226  
229 227 .shopname_title_size{ font-size: 34rpx}
230   -.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:90rpx;right: 0 }
  228 +.big .all_view{display: flex; width: 500rpx; position:absolute; bottom:rpx;right: 0 }
231 229 .big .all_view .v_item{width:33%; }
232 230  
233 231 .big_border_two .title_center{ display: flex; justify-content: center;}
... ...
images/share/miao_share.png
View file @142b2a5

14 KB | W: | H:

6.07 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
packageA/pages/prom_list/prom_list.js
  View file @142b2a5
... ... @@ -241,20 +241,22 @@ Page({
241 241 }else{
242 242 ee.setData({ data: t.data.data, });
243 243 }
244   -
245   - /*---获取活动的重表---*/
246   - //调用接口判断订单优惠，
247   - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => {
248   - if(res.data.code==0){
249   - var r_data=res.data.data;
250   - th.loop_promise(0,r_data.collocationList,function(){
251   - ee.setData({
252   - collocationGoods:r_data.collocationPromList,
253   - collocationList:r_data.collocationList,
254   - })
255   - })
256   - }
257   - })
  244 +
  245 + if(!ee.data.collocationList){
  246 + /*---获取活动的重表---*/
  247 + //调用接口判断订单优惠，
  248 + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => {
  249 + if(res.data.code==0){
  250 + var r_data=res.data.data;
  251 + th.loop_promise(0,r_data.collocationList,function(){
  252 + ee.setData({
  253 + collocationGoods:r_data.collocationPromList,
  254 + collocationList:r_data.collocationList,
  255 + })
  256 + })
  257 + }
  258 + })
  259 + }
258 260  
259 261 //获取统一条形码,普通商品和优惠促销的商品
260 262 if ( t.data.data.prom_type == 5){
... ... @@ -274,7 +276,7 @@ Page({
274 276 }
275 277 //---通过接口获取门店的线下库存信息--
276 278 return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
277   - data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
  279 + data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}
278 280 })
279 281 }).then(res=>{
280 282 if(res.data.code==0 && res.data.data.total>0){
... ... @@ -414,7 +416,7 @@ Page({
414 416 var pick=th.get_pick_from_list(th.data.sto_sele_id)
415 417 //---通过接口获取门店的线下库存信息--
416 418 getApp().request.get("/api/weshop/goods/getWareStorages",{
417   - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid},
  419 + data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000},
418 420 success:function(res){
419 421 if(res.data.code==0){
420 422 if(res.data.data.pageData.length>0){
... ... @@ -943,7 +945,7 @@ Page({
943 945 }
944 946 //---通过接口获取门店的线下库存信息--
945 947 return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
946   - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
  948 + data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}
947 949 })
948 950 }).then(res=>{
949 951 if(res.data.code==0){
... ... @@ -1301,7 +1303,7 @@ Page({
1301 1303 })
1302 1304 //读取线下的门店库存
1303 1305 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
1304   - data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
  1306 + data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000}
1305 1307 }).then(res=>{
1306 1308 if(res.data.code==0 && res.data.data.total>0){
1307 1309 plist=res.data.data.pageData[0];
... ...
pages/cart/cart2/cart2.js
  View file @142b2a5
... ... @@ -668,7 +668,10 @@ Page({
668 668 th.setData({collocation_goods:gg.collocation_goods});
669 669  
670 670 var cart_arr=new Array();
671   - var narr=gg.collocation_goods;
  671 + //var narr=gg.collocation_goods;
  672 + //修改成深拷贝，确保返回是数据正确
  673 + var narr=JSON.parse(JSON.stringify(gg.collocation_goods));
  674 +
672 675 narr.push(t.data.data);
673 676 var ie = {
674 677 pickup_id: gg.pick_id, pname: gg.pick_name, goods: narr, exp_type: et, wind: m_wind, distr_t: distr_t,
... ... @@ -2170,7 +2173,7 @@ Page({
2170 2173 })
2171 2174 //读取线下的门店库存
2172 2175 await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
2173   - data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
  2176 + data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000}
2174 2177 }).then(res=>{
2175 2178 if(res.data.code==0){
2176 2179 plist=res.data.data.pageData[0];
... ... @@ -2845,8 +2848,10 @@ Page({
2845 2848 //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () {
2846 2849 //var arr=th.data.order_prom_list_cart;
2847 2850 var arr=order_prom_list_cart;
  2851 + if(!arr) arr=[];
2848 2852 //如果系统有限制使用优惠券
2849 2853 if(th.data.is_close_quan) return false;
  2854 +
2850 2855 //------------开始计算使用优惠券相关------------
2851 2856 for(var ind in arr){
2852 2857 var ep=arr[ind];
... ...
pages/justTest/justTest.js deleted
View file @e1d2784
1   -// pages/justTest/justTest.js
2   -// let livePlayer = requirePlugin('live-player-plugin');
3   -
4   -
5   -var t = require("../../utils/util.js"),
6   - ut = t,
7   - e = require("../../utils/common.js"),
8   - a = require("../../utils/wxParse/wxParse.js"),
9   - s = getApp(),
10   - i = s.request,
11   - rq = i,
12   - oo = s.globalData,
13   - o = s.globalData.setting,
14   - os = o;
15   -var utils = require('../../utils/util.js'),ut=utils;
16   -var regeneratorRuntime = require('../../utils/runtime.js');
17   -
18   -Page({
19   -
20   - /**
21   - * 页面的初始数据
22   - */
23   - data: {
24   - gid: "",
25   - stoid: o.stoid,
26   - url: o.url,
27   - resourceUrl: o.resourceUrl,
28   - iurl: o.imghost,
29   - defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
30   - data: null,
31   - openSpecModal: !1,
32   - openPromModal: !1,
33   - supportPageScroll: !1,
34   -
35   - //联系电话
36   - mobile: '',
37   - bconfig:null,
38   - sales_rules:1,
39   -
40   - t_time:null,
41   - card_field:"",
42   - dp_price:0,
43   - cut_price:0,
44   - open_ind_store:1,
45   - goodsInputNum:1,
46   - g_buy_num: null,
47   - sele_collocation:null,
48   -
49   -
50   -
51   - photoUrl: "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1003256280,1176261798&fm=26&gp=0.jpg",
52   - //（用来控制显示哪个按钮） false表示还没首次进行弹框授权，或者已经授权了；true表示在首次授权弹框时拒绝授权，或者在设置页面还是拒绝了授权
53   - isAuthSavePhoto: false
54   - },
55   -
56   -
57   -
58   -
59   -
60   - sendRequest: function () {
61   -
62   -
63   -
64   - //调用接口判断是不是会员
65   - getApp().request.promiseGet("/api/weshop/wx/livelist/page",{
66   - data:{store_id: 1}
67   - }).then(res=>{
68   - console.log(res);
69   - // if(res.data.code==0){
70   - // getApp().globalData.guide_id=res.data.data.id;
71   - // }
72   - })
73   -
74   - },
75   - // nav: function () {
76   - // wx.redirectTo({
77   - // url: '/packageA/pages/liveStream/liveStream'
78   - // })
79   - // },
80   - /**
81   - * 生命周期函数--监听页面加载
82   - */
83   - onLoad: function (options) {
84   -
85   - },
86   -
87   - /**
88   - * 生命周期函数--监听页面初次渲染完成
89   - */
90   - onReady: function () {
91   -
92   - },
93   -
94   - /**
95   - * 生命周期函数--监听页面显示
96   - */
97   - onShow: function () {
98   -
99   - },
100   -
101   - /**
102   - * 生命周期函数--监听页面隐藏
103   - */
104   - onHide: function () {
105   -
106   - },
107   -
108   - /**
109   - * 生命周期函数--监听页面卸载
110   - */
111   - onUnload: function () {
112   -
113   - },
114   -
115   - /**
116   - * 页面相关事件处理函数--监听用户下拉动作
117   - */
118   - onPullDownRefresh: function () {
119   -
120   - },
121   -
122   - /**
123   - * 页面上拉触底事件的处理函数
124   - */
125   - onReachBottom: function () {
126   -
127   - },
128   -
129   - /**
130   - * 用户点击右上角分享
131   - */
132   - onShareAppMessage: function () {
133   -
134   - },
135   -
136   -
137   -
138   -
139   - saveImage() {
140   - wx.showLoading({
141   - title: '保存中...',
142   - mask: true,
143   - });
144   - wx.downloadFile({
145   - url:
146   - 'http://upload.jianshu.io/admin_banners/web_images/4435/c1d3ca63353c8bd527f0d781605516cb5b266d02.jpg?imageMogr2/auto-orient/strip|imageView2/1/w/1250/h/540',
147   - success: function(res) {
148   - if (res.statusCode === 200) {
149   - let img = res.tempFilePath;
150   - wx.saveImageToPhotosAlbum({
151   - filePath: img,
152   - success(res) {
153   - wx.showToast({
154   - title: '保存成功',
155   - icon: 'success',
156   - duration: 2000
157   - });
158   - },
159   - fail(res) {
160   - wx.showToast({
161   - title: '保存失败',
162   - icon: 'success',
163   - duration: 2000
164   - });
165   - }
166   - });
167   - }
168   - }
169   - });
170   - },
171   -
172   -
173   -
174   - live() {}
175   -
176   -
177   -})
178 0 \ No newline at end of file
pages/justTest/justTest.json deleted
View file @e1d2784
1   -{
2   - "usingComponents": {}
3   -}
4 0 \ No newline at end of file
pages/justTest/justTest.wxml deleted
View file @e1d2784
1   -<!--pages/justTest/justTest.wxml-->
2   -<text>pages/justTest/justTest.wxml</text>
3   -<navigator url="/packageA/pages/liveStream/liveStream">进入直播</navigator>
4   -<navigator url="/packageA/pages/liveStreamDetails/liveStreamDetails">进入直播详情页</navigator>
5   -<button bindtap="sendRequest">发送请求</button>
6   -
7   -
8   -
9   -
10   -<button open-type="share" class='iconfont icon-weixin'>分享</button>
11   -<button bindopensetting="onOpenSetting" open-type="openSetting" >
12   - 保存图片到手机
13   -</button>
14   -
15   -
16   -
17   -
18   -<button bindtap="showac"></button>
19   -
pages/justTest/justTest.wxss deleted
View file @e1d2784
1   -/* pages/justTest/justTest.wxss */
2   -page {
3   - background: #fff;
4   - text-align: center;
5   -}
6   -
7   -.box {
8   - padding: 30rpx 80rpx;
9   -}
10   -
11   -.img {
12   - width: 430rpx;
13   - height: 430rpx;
14   - margin: 20rpx 0;
15   -}
16   -button {
17   - width: 100%;
18   - background: #ffffff;
19   - border: none;
20   - border-radius: 0rpx;
21   - padding: 0;
22   - margin: 0;
23   -}
24   -
25   -.btn {
26   - background: green;
27   - color: #ffffff;
28   - border-radius: 0;
29   -}
30 0 \ No newline at end of file