wxd / MShopWeApp

Commit f938b33f59f4161d5e28d40c5e0c4bd9744c9906

Authored by 前端研发-钱巧玲
2 parents 0a255dda ee872374

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

Inline Side-by-side
Showing 7 changed files with 198 additions and 176 deletions
pages/user/assistance/assistance.js
  View file @f938b33
... ... @@ -6,7 +6,7 @@ var t = getApp(),
6 6 ut = i,
7 7 s = require("../../../utils/common.js");
8 8 var regeneratorRuntime = require('../../../utils/runtime.js');
9   -var oo = t.globalData.setting;
  9 +var oo = t.globalData.setting,os=oo, ut= require("../../../utils/util.js");
10 10 Page({
11 11  
12 12 /**
... ... @@ -24,6 +24,7 @@ Page({
24 24 is_show_more: 0, //是否加载更多
25 25 help_id:"",//助力活动的id
26 26 timer:"",//任务列表的定时器
  27 + s_num:"",//多少人已经领取任务
27 28  
28 29 },
29 30  
... ... @@ -50,29 +51,36 @@ Page({
50 51  
51 52 },
52 53 // 助力活动
53   - async assistance() {
  54 + assistance() {
54 55 var th=this;
55 56 var user_id = getApp().globalData.user_id;
56 57 var store_id = os.stoid;
57 58  
58   - await getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
  59 + getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
59 60 data: {
60 61 storeId: store_id,
61 62 userId: user_id
62 63 }
63 64 }).then(res => {
64 65 if (res.data.code == 0) {
65   -
  66 +
66 67 var help_data=res.data.data;
67 68 console.log(help_data.id,'数据', res.data.data);
68   - th.setData({
69   - zl_act:help_data,
70   - help_id:help_data.id
71   - });
  69 + th.setData({ zl_act:help_data, help_id:help_data.id });
  70 + return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
  71 + data: {
  72 + helpId: help_data.id, storeId: store_id
  73 + }
  74 + })
72 75  
73 76 }
74   - })
75   -
  77 + return ut.null_promise();
  78 + }).then(res=>{
  79 + if(res.data.code==0)
  80 + th.setData({s_num:res.data.data.countAll})
  81 + })
  82 +
  83 +
76 84 },
77 85  
78 86 //--点击获取用户任务列表--会员的任务列表
... ...
pages/user/assistance/assistance.wxml
  View file @f938b33
... ... @@ -76,10 +76,10 @@
76 76 <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}">
77 77 <view>暂无任务记录</view>
78 78 </view>
79   - <view class="flex-center receive">
  79 + <view class="flex-center receive" wx:if="{{is_load && s_num}}">
80 80 <view class="flex-center">
81 81 <view>已有</view>
82   - <view>{{zl_act.countAll}}</view>
  82 + <view>{{s_num}}</view>
83 83 <view>人领取了任务</view>
84 84 </view>
85 85  
... ...
pages/user/assistance/assistance_success.js
  View file @f938b33
1 1 var auth = require("../../../utils/auth.js"), rq = require("../../../utils/request.js");
2 2 var e = getApp(), app = e, s = e.globalData.setting, os = s, app_d = e.globalData;
3 3 var regeneratorRuntime = require('../../../utils/runtime.js');
  4 +var ut = require("../../../utils/util.js");
4 5 Page({
5 6  
6 7 /**
... ... @@ -10,6 +11,7 @@ Page({
10 11 iurl: s.imghost,
11 12 user:app_d.userInfo,
12 13 zl_act:null, //助力活动
  14 + s_num:0, //分享的人数
13 15 },
14 16  
15 17 /**
... ... @@ -18,42 +20,44 @@ Page({
18 20 onLoad: function (options) {
19 21  
20 22 },
21   -
22   - /**
23   - * 生命周期函数--监听页面初次渲染完成
24   - */
25   - onReady: function () {
26   -
27   - },
28   -
29 23 /**
30 24 * 生命周期函数--监听页面显示
31 25 */
32   - onShow: function () {
33   - this.init();
  26 + onShow: function (e) {
  27 + var helpid=e.helpid;
  28 + this.init(helpid);
34 29 },
35 30  
36 31 // ----初始化----
37   - init:function() {
38   -
  32 + init:function(helpid) {
39 33 var user_id = getApp().globalData.user_id;
40 34 var store_id = os.stoid;
41 35 var th=this;
42   - getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", {
  36 +
  37 + //链式调用接口,先获取活动,在获取参与活动的人数
  38 + getApp().request.promiseGet("/api/weshop/marketing/help/help/user/page", {
43 39 data: {
44   - user_id: user_id,
45   - store_id: store_id
  40 + userId: app_d.user_id,
  41 + storeId: os.store_id,
  42 + helpId: helpid
46 43 }
47 44 }).then(res => {
48   - if(res.data.code==0) th.setData({zl_act:res.data.data})
49   - })
50   -
51   - },
52   -
53   - /**
54   - * 生命周期函数--监听页面隐藏
55   - */
56   - onHide: function () {
  45 + if(res.data.code==0){
  46 + th.setData({zl_act:res.data.data});
  47 + return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
  48 + data: {
  49 + storeId: os.store_id,
  50 + helpId: helpid
  51 + }
  52 + })
  53 + }
  54 + return ut.null_promise();
  55 +
  56 + }).then(res=>{
  57 + if(res.data.code==0){
  58 + th.setData({s_num:res.data.data.countAll});
  59 + }
  60 + })
57 61  
58 62 },
59 63  
... ... @@ -65,10 +69,4 @@ Page({
65 69  
66 70 },
67 71  
68   - /**
69   - * 用户点击右上角分享
70   - */
71   - onShareAppMessage: function () {
72   -
73   - }
74 72 })
75 73 \ No newline at end of file
... ...
pages/user/assistance/assistance_success.wxml
  View file @f938b33
... ... @@ -17,7 +17,7 @@
17 17 </view>
18 18 </view>
19 19 <view class="cklie_button t-c flex-center" bindtap="cklie_button">我也要参加</view>
20   -<view class="fs26 white t-c">已有{{zl_act.qiang_num}}人领取礼盒</view>
  20 +<view class="fs26 white t-c" wx:if="{{s_num}}">已有{{s_num}}人领取礼盒</view>
21 21  
22 22 <!-- 引入提示组件 -->
23 23 <warn id="warn"></warn>
... ...
pages/user/assistance/friend_assistance.js
  View file @f938b33
1   -var auth = require("../../../utils/auth.js"), rq = require("../../../utils/request.js");
2   -var e = getApp(), app = e, s = e.globalData.setting, os = s, app_d = e.globalData;
  1 +var auth = require("../../../utils/auth.js"),
  2 + rq = require("../../../utils/request.js");
  3 +var e = getApp(),
  4 + app = e,
  5 + s = e.globalData.setting,
  6 + os = s,
  7 + app_d = e.globalData;
3 8 var regeneratorRuntime = require('../../../utils/runtime.js');
  9 +var ut = require("../../../utils/util.js");
  10 +
4 11 Page({
  12 + /**
  13 + * 页面的初始数据
  14 + */
  15 + data: {
  16 + iurl: s.imghost,
  17 + is_show: 0, //显示弹框
  18 + user: app_d.userInfo,
  19 + zl_act: null, //助力活动
  20 + task_id: 0, //助力任务ID
  21 + userId: 0, //任务用户的ID
  22 + s_num: 0, //分享的人数
  23 + },
5 24  
6   - /**
7   - * 页面的初始数据
8   - */
9   - data: {
10   - iurl: s.imghost,
11   - is_show:0,//显示弹框
12   - user:app_d.userInfo,
13   - zl_act:null, //助力活动
14   - task_id:0, //助力任务ID
15   - userId:0, //任务用户的ID
16   - },
  25 + /**
  26 + * 生命周期函数--监听页面加载
  27 + */
  28 + onLoad: function(options) {
  29 + var th = this;
  30 + if (options.task_id) this.data.task_id = options.task_id;
  31 + if (options.userId) this.data.userId = options.userId;
  32 + //任务是不是为空
  33 + if (this.data.task_id == 0 || this.data.task_id == undefined) {
  34 + this.data.task_id = decodeURIComponent(options.scene);
  35 + if (this.data.task_id != null && this.data.task_id != 'undefined' && this.data.task_id != "" && this.data.task_id !=
  36 + 0) {
  37 + getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
  38 + data: {
  39 + id: th.data.task_id,
  40 + storeId: os.stoid
  41 + }
  42 + }).then(res => {
  43 + if (res.data.code == 0) {
  44 + th.data.userId = res.data.data.user_id;
  45 + //获取活动的时间
  46 + return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
  47 + data: {
  48 + id: th.data.task_id,
  49 + storeId: os.stoid
  50 + }
  51 + })
  52 + }
  53 + return ut.null_promise();
  54 + }).then(res => {
  55 + if (res.data.code == 0) {
  56 + th.setData({
  57 + zl_act: res.data.data
  58 + })
  59 + //获取活动的参与的人数
  60 + return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
  61 + data: {
  62 + helpId: res.data.data.id,
  63 + storeId: os.stoid
  64 + }
  65 + })
  66 + }
  67 + return ut.null_promise();
  68 + }).then(res => {
  69 + if (res.data.code == 0) {
  70 + th.setData({
  71 + s_num: res.data.data.countAll
  72 + });
  73 + }
  74 + })
17 75  
18   - /**
19   - * 生命周期函数--监听页面加载
20   - */
21   - onLoad: function (options) {
22   - var th=this;
23   - if(options.task_id) this.data.task_id=options.task_id;
24   - if(options.userId) this.data.userId=options.userId;
25   - //任务是不是为空
26   - if(this.data.task_id==0 || this.data.task_id==undefined){
27   - this.data.task_id= decodeURIComponent(options.scene);
28   - if(this.data.task_id!=null && this.data.task_id!='undefined' && this.data.task_id!="" && this.data.task_id!=0){
29   - getApp().request.get("http://172.20.3.102:8022/api/weshop/zl_act_user",{
30   - data:{},
31   - success:function(res){
32   - if(res.data.code==0){
33   - th.data.userId=res.data.data.user_id;
34   - }
35   - }
36   - })
37   -
38   - }
39   - }
40   - },
  76 + }
  77 + }
  78 + },
41 79  
42 80  
43   - // 跳转到助力成功页
44   - participate_activity:function(){
45   - wx.navigateTo({
46   - url: '/pages/user/assistance/assistance_success',
47   - })
48   - },
49   -
50   - /**
51   - * 生命周期函数--监听页面显示
52   - */
53   - onShow: function () {
54   - this.init();
55   - },
56   - //点击开启礼盒
57   - cklie_button:function(){
58   - var th=this;
59   - var t_user_id=app_d.user_id;
60   - var data={id:this.data.task_id,storeId:os.stoid,userId:this.data.user_id, zlUserId:t_user_id};
61   - console.log(data);
62   - getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
63   - data, //入参
64   - function(res){ //成功
65   - if(res.data.code==0)
66   - this.setData({ is_show:1});
67   - else{
68   - getApp().my_warnning(res.data.msg,0,th)
69   - }
70   - },
71   - function(){//失败
72   -
73   - }
74   - )
75   -
76   -
77   -
78   - },
79   - //点击关闭礼盒
80   - clike_none:function(){
81   - this.setData({ is_show:0});
82   - },
83   - //导航球
84   - close: function () {
85   - var th = this;
86   - var nav_b = th.selectComponent("#nav_b"); //组件的id
87   - nav_b.close_box();
88   - nav_b.set_name("助力", "");
89   - },
90   - /**
91   - * 生命周期函数--监听页面隐藏
92   - */
93   - onHide: function () {
  81 + // 跳转到助力成功页
  82 + participate_activity: function() {
  83 + wx.navigateTo({
  84 + url: '/pages/user/assistance/assistance_success',
  85 + })
  86 + },
94 87  
95   - },
  88 + /**
  89 + * 生命周期函数--监听页面显示
  90 + */
  91 + onShow: function() {
96 92  
97   - /**
98   - * 生命周期函数--监听页面卸载
99   - */
100   - onUnload: function () {
  93 + },
  94 + //点击开启礼盒
  95 + cklie_button: function() {
  96 + var th = this;
  97 + var t_user_id = app_d.user_id;
  98 + var data = {
  99 + id: this.data.task_id,
  100 + storeId: os.stoid,
  101 + userId: this.data.user_id,
  102 + zlUserId: t_user_id
  103 + };
  104 + console.log(data);
  105 + getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
  106 + data, //入参
  107 + function(res) { //成功
  108 + if (res.data.code == 0)
  109 + this.setData({
  110 + is_show: 1
  111 + });
  112 + else {
  113 + getApp().my_warnning(res.data.msg, 0, th)
  114 + }
  115 + },
  116 + function() { //失败
101 117  
102   - },
  118 + }
  119 + )
103 120  
104   - /**
105   - * 页面相关事件处理函数--监听用户下拉动作
106   - */
107   - onPullDownRefresh: function () {
  121 + },
  122 + //点击关闭礼盒
  123 + clike_none: function() {
  124 + this.setData({
  125 + is_show: 0
  126 + });
  127 + },
  128 + //导航球
  129 + close: function() {
  130 + var th = this;
  131 + var nav_b = th.selectComponent("#nav_b"); //组件的id
  132 + nav_b.close_box();
  133 + nav_b.set_name("助力", "");
  134 + },
108 135  
109   - },
  136 + /**
  137 + * 页面上拉触底事件的处理函数
  138 + */
  139 + onReachBottom: function() {
110 140  
111   - /**
112   - * 页面上拉触底事件的处理函数
113   - */
114   - onReachBottom: function () {
  141 + },
115 142  
116   - },
  143 + /**
  144 + * 用户点击右上角分享
  145 + */
  146 + onShareAppMessage: function() {
117 147  
118   - /**
119   - * 用户点击右上角分享
120   - */
121   - onShareAppMessage: function () {
  148 + },
122 149  
123   - },
124   -
125   - // ----初始化----
126   - init:function() {
127   -
128   - var user_id = getApp().globalData.user_id;
129   - var store_id = os.stoid;
130   - var th=this;
131   - getApp().request.promiseGet("http://172.20.3.102:8022/api/weshop/zl_act", {
132   - data: {
133   - user_id: user_id,
134   - store_id: store_id
135   - }
136   - }).then(res => {
137   - if(res.data.code==0) th.setData({zl_act:res.data.data})
138   - })
139   -
140   - },
141   -})
142 150 \ No newline at end of file
  151 +})
... ...
pages/user/index/index.js
  View file @f938b33
... ... @@ -51,14 +51,15 @@ Page({
51 51 * 生命周期函数--监听页面加载
52 52 */
53 53 onLoad: function (options) {
54   - this.birthday();
55   - this.is_assistance();
  54 + this.birthday();
56 55 },
57 56  
58 57 /**
59 58 * 生命周期函数--监听页面显示
60 59 */
61 60 onShow: function () {
  61 +
  62 + this.is_assistance();
62 63  
63 64 var stoid = app_d.setting.stoid;
64 65 var s = this,th=s,need_money=0,cur_g_num=0;
... ... @@ -128,10 +129,12 @@ Page({
128 129 await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get",{
129 130 data:{ storeId:os.stoid,userId:app_d.user_id }
130 131 }).then(res=>{
131   - gid=res.data.data.GradeId;
132   - var cz_val = res.data.data.GradeSum;
133   - cz_vals=parseInt(cz_val);
134   - GradeName=res.data.data.GradeName;
  132 + if (res.data.code == 0 && res.data.data){
  133 + gid=res.data.data.GradeId;
  134 + var cz_val = res.data.data.GradeSum;
  135 + cz_vals=parseInt(cz_val);
  136 + GradeName=res.data.data.GradeName;
  137 + }
135 138 //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
136 139 })
137 140 var obj = { cz_val: cz_vals, GradeName:GradeName, is_init: is_init, gradeId: gid };
... ...
utils/util.js
  View file @f938b33
1   -
2 1 function isString(str) {
3 2 return (typeof str == 'string') && str.constructor == String;
4 3 }
... ... @@ -309,6 +308,11 @@ function draw_randon_rect(ctx,x,y,r,w,h){
309 308  
310 309 }
311 310  
  311 +
  312 +function null_promise(){
  313 + var promise=new Promise(function(resolve, reject){ var ob={code:-1,data:null}; resolve(ob); }); return promise;
  314 +}
  315 +
312 316 module.exports = {
313 317 formatTime: function(e, r) {
314 318 var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
... ...