wxd / MShopWeApp

Commit 7f7477e44ba89022518fda714216e96d99e6ecad

Authored by 前端开发-罗建龙
2 parents 2f83a6fe 3a11483c

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 8 changed files with 147 additions and 9 deletions
... ... @@ -1064,7 +1064,7 @@ App({
1064 1064 var third_rate = dis_config.third_rate; // 三级比例
1065 1065  
1066 1066 if(this.globalData.userInfo.first_leader){
1067   - return parseFloat(parseFloat(first_money).toFixed(2));
  1067 + return parseFloat(parseFloat(fir_num).toFixed(2));
1068 1068 }else{
1069 1069 return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
1070 1070 }
... ...
packageA/pages/checkin/checkin.js
  View file @7f7477e
... ... @@ -33,6 +33,8 @@ Page({
33 33  
34 34 flag: true,
35 35 isLogin: false,
  36 + imgUrl: app.globalData.setting.imghost,
  37 + show_no_integral:false
36 38  
37 39 },
38 40  
... ... @@ -46,11 +48,16 @@ Page({
46 48 });
47 49 self.loadCheckedRecord();
48 50 }else{
49   - wx.showToast({
50   - title: "网络繁忙，请重试",
51   - icon: 'none',
52   - duration: 2000
53   - })
  51 + if(res.data.msg.indexOf('未开启签到')!=-1){
  52 + self.setData({ show_no_integral: true });
  53 + }else{
  54 + wx.showToast({
  55 + title: res.data.msg,
  56 + icon: 'none',
  57 + duration: 2000
  58 + })
  59 + }
  60 +
54 61 }
55 62 },
56 63 });
... ... @@ -390,5 +397,10 @@ Page({
390 397 if(url){
391 398 getApp().goto(url);
392 399 }
  400 + },
  401 +
  402 + back_to(){
  403 + wx.navigateBack();
393 404 }
  405 +
394 406 })
... ...
packageA/pages/checkin/checkin.wxml
  View file @7f7477e
... ... @@ -139,4 +139,20 @@
139 139 </view>
140 140 </view>
141 141  
  142 + <view bindtap="back_to" wx:if="{{show_no_integral}}">
  143 + <view class="cover-layer"></view>
  144 + <view class="pop_up_no">
  145 + <view class="title" style="position:relative">
  146 + 提示
  147 + <image class="close_img" src="{{imgUrl}}/miniapp/images/close.png"></image>
  148 + </view>
  149 + <view class="content">
  150 + <image style="width:270rpx; height:270rpx; margin:20rpx 0"
  151 + src="{{imgUrl}}/miniapp/images/fenxiao.png"></image>
  152 + <view style="margin-top:10rpx">商家暂时未开启积分签到，敬请期待哦！ </view>
  153 + </view>
  154 + </view>
  155 + </view>
  156 +
  157 +
142 158 </view>
143 159 \ No newline at end of file
... ...
packageA/pages/checkin/checkin.wxss
  View file @7f7477e
... ... @@ -354,3 +354,44 @@ page,
354 354 flex-wrap: wrap;
355 355 text-align:center;
356 356 }
  357 +
  358 +.cover-layer {
  359 + position: fixed;
  360 + left: 0;
  361 + top: 0;
  362 + right: 0;
  363 + bottom: 0;
  364 + z-index: 1000;
  365 + background: rgba(0,0,0,0.4);
  366 + width: 100%;
  367 + height: 100%;
  368 +}
  369 +
  370 +.pop_up_no{
  371 + z-index: 2000;
  372 + position: fixed;
  373 + width:80%;
  374 + height:500rpx;
  375 + left: 50%;
  376 + top:50%;
  377 + transform:translate(-50%,-50%);
  378 + background-color: #fff;
  379 + font-size: 28rpx;
  380 + border-radius: 20rpx;
  381 +}
  382 +
  383 +.pop_up_no .title{
  384 + height: 90rpx;
  385 + background-color: #ffd601;
  386 + text-align: center;
  387 + line-height: 90rpx;
  388 + border-top-right-radius: 20rpx;
  389 + border-top-left-radius: 20rpx;
  390 +}
  391 +
  392 +.pop_up_no .content{
  393 + text-align: center;
  394 +}
  395 +.pop_up_no .close_img{
  396 + width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx;
  397 + }
357 398 \ No newline at end of file
... ...
packageA/pages/quan_list/quan_list.js
  View file @7f7477e
... ... @@ -32,6 +32,9 @@ Page({
32 32 //---展示---
33 33 onShow: function () {
34 34  
  35 + //检查能不能分享
  36 + getApp().check_can_share();
  37 +
35 38 console.log("onShow:1");
36 39 this.data.curpage = 1;
37 40 this.setData({ dataList: null });
... ... @@ -41,6 +44,8 @@ Page({
41 44 //var data = [{ is_get:0,money:50,condition:500,id:1,name: "券名字", endtype: 0, use_start_time: 1579596090, use_end_time: 1611218490, everyone_num: 2,interval_time:1,color:"red"}];
42 45 //th.setData({dataList: data});
43 46 this.setData({ getcurday: ut.gettimestamp() });
  47 +
  48 +
44 49 },
45 50  
46 51 onHide: function () {
... ... @@ -184,5 +189,36 @@ Page({
184 189 var index = e.currentTarget.dataset.ind;
185 190 var item = this.data.dataList[index];
186 191 getApp().goto("/packageA/pages/quan_pro/quan_pro?id=" + item.id);
187   - }
  192 + },
  193 +
  194 +
  195 + //发送给好友
  196 + onShareAppMessage:async function(e) {
  197 + getApp().globalData.no_clear=1;
  198 + var url= `packageA/pages/quan_list/quan_list`;
  199 + var userInfo = getApp().globalData.userInfo;
  200 + //是分销商才带
  201 + if (userInfo) {
  202 + url += "?first_leader=" + userInfo.user_id;
  203 + }
  204 + var ob = {
  205 + title:"优惠券列表",
  206 + path: url,
  207 + //imageUrl:this.data.url+this.data.store_config.store_logo,
  208 + };
  209 + return ob;
  210 + },
  211 +
  212 + //发送给朋友圈
  213 + onShareTimeline() {
  214 + getApp().globalData.no_clear=1;
  215 + var user_id= getApp().globalData.user_id
  216 + return {
  217 + title:"优惠券列表",
  218 + query: 'first_leader='+user_id
  219 + }
  220 + },
  221 +
  222 +
  223 +
188 224 });
... ...
packageA/pages/quan_pro/quan_pro.js
  View file @7f7477e
... ... @@ -44,6 +44,10 @@ Page({
44 44  
45 45 //---展示,显示券的信息---
46 46 onShow: function() {
  47 +
  48 + //检查能不能分享
  49 + getApp().check_can_share();
  50 +
47 51 var th=this;
48 52 var user_id=getApp().globalData.user_id;
49 53 getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
... ... @@ -170,4 +174,33 @@ Page({
170 174 show_success:0
171 175 })
172 176 },
  177 +
  178 + //发送给好友
  179 + onShareAppMessage:async function(e) {
  180 + getApp().globalData.no_clear=1;
  181 + var url= "packageA/pages/quan_pro/quan_pro?id="+this.data.id;
  182 + var userInfo = getApp().globalData.userInfo;
  183 + //是分销商才带
  184 + if (userInfo) {
  185 + url += "&first_leader=" + userInfo.user_id;
  186 + }
  187 + var ob = {
  188 + title:this.data.q_data.name,
  189 + path: url,
  190 + //imageUrl:this.data.url+this.data.store_config.store_logo,
  191 + };
  192 + return ob;
  193 + },
  194 +
  195 + //发送给朋友圈
  196 + onShareTimeline() {
  197 + getApp().globalData.no_clear=1;
  198 + var user_id= getApp().globalData.user_id
  199 + return {
  200 + title:this.data.q_data.name,
  201 + query: 'id='+this.data.id+'&first_leader='+user_id
  202 + }
  203 + },
  204 +
  205 +
173 206 });
... ...
pages/index/index/index.wxml
  View file @7f7477e
1 1  
2 2 <!-- 全屏控制 -->
3   -<view wx:if="{{is_full_screen_show && full_ad && full_ad.show_type==0}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
  3 +<view wx:if="{{is_full_screen_show && full_ad && !full_ad.show_type}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');">
4 4 <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view>
5 5 </view>
6 6  
... ...
pages/user/order_detail/order_detail.js
  View file @7f7477e
... ... @@ -132,7 +132,7 @@ Page({
132 132  
133 133 //------获取订单商品-------
134 134 rq.get("/api/weshop/ordergoods/list",{
135   - data: { store_id: os.stoid, order_id: oid},
  135 + data: { store_id: os.stoid, order_id: oid,pageSize:600},
136 136 success:async function (eb) {
137 137 r.order_goods=eb.data.data.pageData;
138 138 var glist = r.order_goods;
... ...