wxd / MShopWeApp

Commit 6cdaff713e02221274c9e82921ecd3dc9fc31880

Authored by 后端研发-苏明海
2 parents b8f0596d ef12cb65

Merge branch 'dev' into 'test' 

Dev

See merge request !284
Inline Side-by-side
Showing 21 changed files with 170 additions and 117 deletions
components/diy_advertising/diy_advertising.js
  View file @6cdaff7
... ... @@ -12,8 +12,8 @@ Component({
12 12 yc:false,
13 13 btn: 1,
14 14 ad:false,
15   - autoplay:false,
16   - interval:5000,
  15 + autoplay:true,
  16 + interval:3000,
17 17 duration:1000,
18 18 someData: {},
19 19 max_sw_height:null,
... ... @@ -36,4 +36,4 @@ Component({
36 36 if (this.data.max_sw_height < viewHeight) this.setData({ max_sw_height: viewHeight });
37 37 }
38 38 }
39   -})
40 39 \ No newline at end of file
  40 +})
... ...
components/diy_picMax/diy_picMax.wxss
  View file @6cdaff7
1 1 .picMax{width: 100%;position: relative;}
2   -.pic_item{display: inline-block; top:0;left:0;vertical-align: middle}
  2 +.pic_item{display: block; top:0;left:0;float:left}
3 3 .pic_item image{width: 100%; height: 100%}
4 4 .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
5 5 /* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @6cdaff7
... ... @@ -439,7 +439,6 @@ Page({
439 439 'content-type': 'application/json'
440 440 },// 设置请求的 header
441 441 success: function (res) {
442   -
443 442 th.data.is_summit_ing=0; //是否提交中
444 443 wx.hideLoading();
445 444 if (res.statusCode == 200) {
... ... @@ -469,7 +468,8 @@ Page({
469 468 util_pay.pay(data.data, function() {
470 469 setTimeout(function () {
471 470 wx.navigateTo({
472   - url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
  471 + //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
  472 + url: "/pages/team/team_success/team_success?ordersn=" + data.data,
473 473 })
474 474 },1000)
475 475 }, function () {
... ...
pages/getphone/getphone.js
  View file @6cdaff7
... ... @@ -54,9 +54,11 @@ Page({
54 54 //接下来写业务代码登录
55 55 //最后，记得返回刚才的页面
56 56 if (e.encryptedData==undefined){
  57 + /*---
57 58 wx.navigateTo({
58 59 url: '/pages/user/binding_info/binding_info',
59   - })
  60 + })--*/
  61 + return app.my_warnning("登录需要授权手机号码！", 0, that);
60 62 return false;
61 63 }
62 64 var r=getApp().globalData.getu;
... ... @@ -105,6 +107,7 @@ Page({
105 107  
106 108 },
107 109 failStatus: function (t) {
  110 + /*---
108 111 return "100" === t.data.result ? (i.goHome(), wx.navigateTo({
109 112 url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl
110 113 }), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", {
... ... @@ -115,7 +118,8 @@ Page({
115 118 failStatus: function () {
116 119 return !1;
117 120 }
118   - }), !1);
  121 + }), !1);--*/
  122 + return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
119 123 },
120 124 fail: function (t) {
121 125 return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
... ...
pages/getphone/getphone.json
  View file @6cdaff7
1 1 {
2   - "navigationBarTitleText": "绑定手机"
  2 + "navigationBarTitleText": "绑定手机",
  3 + "usingComponents": {
  4 + "warn": "/components/long_warn/long_warn"
  5 + }
3 6 }
... ...
pages/getphone/getphone.wxml
  View file @6cdaff7
... ... @@ -6,4 +6,5 @@
6 6 <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getphone">绑定会员</button>
7 7 <text class="btn2" bindtap="cancle_bind">暂不绑定</text>
8 8 </view>
9   -</view>
10 9 \ No newline at end of file
  10 +</view>
  11 +<warn id="warn"></warn>
11 12 \ No newline at end of file
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @6cdaff7
... ... @@ -315,10 +315,20 @@ Page({
315 315 bind_bnerr2: function(e) {
316 316 var _errImg = e.target.dataset.errorimg;
317 317 var _errObj = {};
318   - _errObj[_errImg] = "/public/images/empty.jpg";
  318 + _errObj[_errImg] = "/miniapp/images/giftbag/gift01.png";
319 319 this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  320 + },
  321 +
  322 + //图片失败，默认图片
  323 + bind_bnerr: function (e) {
  324 + var _errImg = e.target.dataset.errorimg;
  325 + var _errObj = {};
  326 + _errObj[_errImg] = this.data.iurl + "miniapp/images/big_back.jpg";
  327 + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  328 + //this.setData({ giftImage: this.data.iurl + "/miniapp/images/giftbag/gift01.png"});
320 329  
321 330 },
  331 +
322 332 //关闭导航
323 333 close: function() {
324 334 var th = this;
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @6cdaff7
1 1 <view class="box data-v-3a5b7e36">
2 2 <view class="box_top data-v-3a5b7e36">
3   - <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="giftImage"></image>
  3 + <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
4 4 </view>
5 5 <view class="box_title data-v-3a5b7e36">
6 6 <view class="top_title data-v-3a5b7e36">
... ...
pages/giftpack/giftpacklist/giftpacklist.wxss
  View file @6cdaff7
... ... @@ -96,6 +96,7 @@
96 96 border: 2rpx solid #999;
97 97 width: 120rpx;
98 98 height: 120rpx;
  99 + background-color: #f8f8f8;
99 100 }
100 101  
101 102 .box_ware_item.data-v-3a5b7e36 {
... ... @@ -241,4 +242,4 @@ page.data-v-3a5b7e36 {
241 242 }
242 243 .overdue.data-v-3a5b7e36{
243 244 background-color: rgb(153,153,153);
244   -}
245 245 \ No newline at end of file
  246 +}
... ...
pages/user/assistance/assistance.js
  View file @6cdaff7
... ... @@ -81,7 +81,7 @@ Page({
81 81 }
82 82 return ut.null_promise();
83 83 }).then(res => {
84   - if (res.data.code == 0)
  84 + if ( res && res.data &&res.data.code == 0)
85 85 th.setData({
86 86 s_num: res.data.data.countAll
87 87 })
... ... @@ -135,7 +135,7 @@ Page({
135 135 })
136 136 }
137 137 } else {
138   - getApp().my_warnning(res.data.msg, 0, th);
  138 + //getApp().my_warnning(res.data.msg, 0, th);
139 139 th.setData({
140 140 is_show_more: 1,
141 141 page: page
... ...
pages/user/assistance/assistance_success.js
  View file @6cdaff7
... ... @@ -18,23 +18,25 @@ Page({
18 18 * 生命周期函数--监听页面加载
19 19 */
20 20 onLoad: function (options) {
21   - //var helpid=options.helpid;
22   - var helpid=23;
  21 + var helpid=options.helpid;
23 22 this.init(helpid);
  23 + var nav_b = this.selectComponent("#nav_b"); //组件的id
  24 + nav_b.set_name("助力", "/pages/user/assistance/assistance");
  25 +
24 26 },
25 27 /**
26 28 * 生命周期函数--监听页面显示
27 29 */
28 30 onShow: function (e) {
29   -
  31 +
30 32 },
31 33  
32 34 // ----初始化----
33   - init:function(helpid) {
  35 + init:function(helpid) {
34 36 var user_id = getApp().globalData.user_id;
35 37 var store_id = os.stoid;
36 38 var th=this;
37   -
  39 +
38 40 //链式调用接口,先获取活动,在获取参与活动的人数
39 41 getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
40 42 data: {
... ... @@ -49,10 +51,10 @@ Page({
49 51 storeId: store_id,
50 52 helpId: helpid
51 53 }
52   - })
  54 + })
53 55 }
54 56 return ut.null_promise();
55   -
  57 +
56 58 }).then(res=>{
57 59 if(res.data.code==0){
58 60 th.setData({s_num:res.data.data.countAll});
... ... @@ -70,6 +72,6 @@ Page({
70 72 },
71 73  
72 74 cklie_button:function(){
73   - getApp().goto("/pages/user/assistance/assistance")
  75 + getApp().goto("/pages/user/assistance/assistance")
74 76 }
75   -})
76 77 \ No newline at end of file
  78 +})
... ...
pages/user/assistance/friend_assistance.js
  View file @6cdaff7
... ... @@ -21,6 +21,7 @@ Page({
21 21 userId: 0, //任务用户的ID
22 22 s_num: 0, //分享的人数
23 23 taskId:0, //活动从表ID
  24 + helpId:0,
24 25 },
25 26  
26 27 /**
... ... @@ -28,64 +29,24 @@ Page({
28 29 */
29 30 onLoad: function(options) {
30 31 var th = this;
31   -
  32 +
  33 + var nav_b = th.selectComponent("#nav_b"); //组件的id
  34 + nav_b.set_name("助力", "/pages/user/assistance/assistance");
  35 +
32 36 if (options.tasking) this.data.tasking = options.tasking;
33 37 if (options.userId) this.data.userId = options.userId;
34 38 //任务是不是为空
35 39 if (this.data.tasking == 0 || this.data.tasking == undefined) {
36   - this.data.tasking = decodeURIComponent(options.scene);
  40 + this.data.tasking = decodeURIComponent(options.scene);
37 41 }
38   -
39   - if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
40   - 0) {
41   -
42   - getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
43   - data: {
44   - taskingId: th.data.tasking,
45   - storeId: os.stoid
46   - }
47   - }).then(res => {
48   - if (res.data.code == 0) {
49   - th.data.userId = res.data.data.userId;
50   - th.data.taskId = res.data.data.taskId;
51   - //获取活动的时间
52   - return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
53   - data: {
54   - helpId: res.data.data.helpFormId,
55   - storeId: os.stoid
56   - }
57   - })
58   - }
59   - return ut.null_promise();
60   - }).then(res => {
61   - if (res.data.code == 0) {
62   - th.setData({
63   - zl_act: res.data.data
64   - })
65   - //获取活动的参与的人数
66   - return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
67   - data: {
68   - helpId: res.data.data.id,
69   - storeId: os.stoid
70   - }
71   - })
72   - }
73   - return ut.null_promise();
74   - }).then(res => {
75   - if (res.data.code == 0) {
76   - th.setData({
77   - s_num: res.data.data.countAll
78   - });
79   - }
80   - })
81   -
82   - }
  42 + getApp().getUserFir(function() {});
  43 +
83 44 },
84 45  
85 46 // 跳转到助力成功页
86 47 participate_activity: function() {
87 48 wx.navigateTo({
88   - url: '/pages/user/assistance/assistance_success',
  49 + url: '/pages/user/assistance/assistance_success?helpid='+this.data.helpId,
89 50 })
90 51 },
91 52  
... ... @@ -93,11 +54,63 @@ Page({
93 54 * 生命周期函数--监听页面显示
94 55 */
95 56 onShow: function() {
  57 + if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
  58 + 0) {
  59 +
  60 + getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", {
  61 + data: {
  62 + taskingId: th.data.tasking,
  63 + storeId: os.stoid
  64 + }
  65 + }).then(res => {
  66 + if (res.data.code == 0) {
  67 + th.data.userId = res.data.data.userId;
  68 + th.data.taskId = res.data.data.taskId;
  69 + th.data.helpId=res.data.data.helpFormId;
  70 + //获取活动的时间
  71 + return getApp().request.promiseGet("/api/weshop/marketing/help/help/act/get", {
  72 + data: {
  73 + helpId: res.data.data.helpFormId,
  74 + storeId: os.stoid
  75 + }
  76 + })
  77 + }
  78 + return ut.null_promise();
  79 + }).then(res => {
  80 + if (res.data.code == 0) {
  81 + th.setData({
  82 + zl_act: res.data.data
  83 + })
  84 + //获取活动的参与的人数
  85 + return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
  86 + data: {
  87 + helpId: res.data.data.id,
  88 + storeId: os.stoid
  89 + }
  90 + })
  91 + }
  92 + return ut.null_promise();
  93 + }).then(res => {
  94 + if (res && res.data && res.data.code == 0) {
  95 + th.setData({
  96 + s_num: res.data.data.countAll
  97 + });
  98 + }
  99 + })
96 100  
  101 + }
97 102 },
98 103 //点击开启礼盒
99 104 cklie_button: function() {
100 105 var th = this;
  106 + //--先判断会员状态--
  107 + var user_info = getApp().globalData.userInfo;
  108 + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
  109 + wx.navigateTo({
  110 + url: '/pages/getphone/getphone',
  111 + })
  112 + return false;
  113 + }
101 114 var t_user_id = app_d.user_id;
102 115 var data = {
103 116 id: this.data.tasking,
... ... @@ -126,7 +139,7 @@ Page({
126 139 //点击关闭礼盒
127 140 clike_none: function() {
128 141 this.setData({is_show: 0});
129   - getApp().goto("/pages/user/assistance/assistance_success");
  142 + getApp().goto("/pages/user/assistance/assistance_success?helpid="+this.data.helpId);
130 143 },
131 144 //导航球
132 145 close: function() {
... ...
pages/user/assistance/giftpacklist.js
  View file @6cdaff7
... ... @@ -210,7 +210,8 @@ Page({
210 210 var json = {
211 211 "actId": th.data.id, //活动Id
212 212 "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
213   - "giftBagId": 1, //礼包Id
  213 + //"giftBagId": 1, //礼包Id
  214 + "giftBagId": th.giftBagId, //礼包Id
214 215 "storeId": a.stoid, //商家Id
215 216 "userId": d.user_id //用户ID
216 217 };
... ... @@ -335,7 +336,7 @@ Page({
335 336 var _errImg = e.target.dataset.errorimg;
336 337 var _errObj = {};
337 338 _errObj[_errImg] ="/miniapp/images/giftbag/gift01.png";
338   - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  339 + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
339 340  
340 341 },
341 342  
... ... @@ -343,9 +344,9 @@ Page({
343 344 bind_bnerr: function (e) {
344 345 var _errImg = e.target.dataset.errorimg;
345 346 var _errObj = {};
346   - _errObj[_errImg] = this.data.iurl + "/miniapp/images/empty.jpg";
347   - //this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
348   - this.setData({ giftImage: this.data.iurl + "/miniapp/images/giftbag/gift01.png"});
  347 + _errObj[_errImg] = this.data.iurl + "miniapp/images/big_back.jpg";
  348 + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  349 + //this.setData({ giftImage: this.data.iurl + "/miniapp/images/giftbag/gift01.png"});
349 350  
350 351 },
351 352  
... ... @@ -355,4 +356,4 @@ Page({
355 356 var nav_b = th.selectComponent("#nav_b"); //组件的id
356 357 nav_b.close_box();
357 358 }
358   -});
359 359 \ No newline at end of file
  360 +});
... ...
pages/user/assistance/task_assistance.js
  View file @6cdaff7
... ... @@ -424,7 +424,7 @@ Page({
424 424 });
425 425 } else {
426 426 th.setData({ is_user_list: 1 });
427   - getApp().my_warnning(su.data.msg, 0, th);
  427 + //getApp().my_warnning(su.data.msg, 0, th);
428 428 }
429 429 }
430 430 })
... ... @@ -678,10 +678,10 @@ Page({
678 678 if (th.data.is_generate) return;
679 679 th.data.is_generate = 1;
680 680  
681   - var scene = 1;
  681 + var scene = this.data.is_user_task.id;
682 682 ///二微码
683 683 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
684   - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/index/index/index";
  684 + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/user/assistance/friend_assistance";
685 685 //读取文件成功则OK--
686 686 wx.getImageInfo({
687 687 src: path3,
... ... @@ -689,8 +689,8 @@ Page({
689 689  
690 690 var ewm_path = res.path; //
691 691 //var act_time="2019.06.26 - 2019.07.02"; //活动的时间
692   - var bg_time = ut.formar_no_full(th.data.dynamic.beginDate);
693   - var end_time = ut.formar_no_full(th.data.dynamic.endDate);
  692 + var bg_time = ut.formar_no_full(th.data.dynamic.beginDate,'.');
  693 + var end_time = ut.formar_no_full(th.data.dynamic.endDate,'.');
694 694 var act_time = bg_time + "-" + end_time;
695 695  
696 696  
... ... @@ -943,9 +943,12 @@ Page({
943 943 th.setData({
944 944 is_share: 1
945 945 })
  946 + wx.showLoading({
  947 + title: "加载中",
  948 + })
946 949 var url = "/api/weshop/marketing/help/help/task/involve/page";
947 950 getApp().request.promiseGet(url, {
948   - isShowLoading: true,
  951 + isShowLoading: false,
949 952 data: {
950 953 storeId: os.stoid,
951 954 taskId: taskid,
... ... @@ -981,6 +984,7 @@ Page({
981 984 th.data.head_pic_arr.length = 0;
982 985 for (var i in images) {
983 986 var img_path = images[i].headPic;
  987 + img_path=img_path.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
984 988 await getApp().request.promise_downimg(img_path).then(res => {
985 989 th.data.head_pic_arr.push(res);
986 990 })
... ...
pages/user/assistance/task_assistance.wxml
  View file @6cdaff7
... ... @@ -56,10 +56,10 @@
56 56 立即兑换
57 57 </view>
58 58  
59   -
60   - <view class="task_clike fs40 t-c flex-center"data-taskid="{{}}" bindtap="test">
61   - 测试专用帮被人拆
62   - </view>
  59 + <!--
  60 + <view class="task_clike fs40 t-c flex-center" bindtap="test">
  61 + 测试专用帮被人拆
  62 + </view>-->
63 63  
64 64 </view>
65 65 <!-- 底部列表 -->
... ... @@ -153,7 +153,6 @@
153 153  
154 154 <!--********** 钱巧玲 -->
155 155 <view wx:if="{{is_share}}">
156   -
157 156 <view class="dust"></view>
158 157 <view class="canvas" style="width:100%;">
159 158 <view class="flex-center">
... ...
pages/user/assistance/task_assistance.wxss
  View file @6cdaff7
... ... @@ -174,6 +174,7 @@ page {
174 174 width: 86%;
175 175 margin: auto;
176 176 margin-top: 50rpx;
  177 + justify-content: center;
177 178 }
178 179  
179 180 .plan-frame .plan_num {
... ...
pages/user/index/index.js
  View file @6cdaff7
... ... @@ -40,6 +40,7 @@ Page({
40 40 actId: "", //生日活动的id
41 41 actImg: "",
42 42 is_assistance: 0, //助力活动
  43 + ad_img:"",
43 44 },
44 45 goto_nav: function(e) {
45 46 var th = this;
... ... @@ -56,7 +57,18 @@ Page({
56 57 * 生命周期函数--监听页面加载
57 58 */
58 59 onLoad: function(options) {
  60 + var th=this;
59 61 this.birthday();
  62 + getApp().request.promiseGet("/api/weshop/ad/list?pid=401&store_id=" + os.stoid, {
  63 + data: {
  64 + enabled: 1
  65 + }
  66 + }).then(res => {
  67 + if(res.data.code==0 && res.data.data){
  68 + var item=res.data.data[0];
  69 + th.setData({ad_img:item.ad_code})
  70 + }
  71 + })
60 72 },
61 73  
62 74 /**
... ... @@ -551,12 +563,12 @@ Page({
551 563 },
552 564 // 判断生日营销的页面是不是存在
553 565 birthday: function() {
554   -
  566 +
555 567 var th = this;
556 568 rq.get("/api/weshop/marketing/birthday/act/judge", {
557 569 data: { storeId: os.stoid, userId: app_d.user_id },
558 570 success: function (res) {
559   -
  571 +
560 572 var code = res.data.code;
561 573 if (code == 0) {
562 574 var giftbagid = res.data.data.giftBagId;
... ... @@ -575,7 +587,7 @@ Page({
575 587 var th = this;
576 588 var actId = th.data.actId;
577 589 var giftbagid = th.data.giftbagid;
578   -
  590 +
579 591 if (actId != "" && giftbagid != "") {
580 592  
581 593 getApp().goto("/pages/giftpack/birthdaygift/birthdaygift?actId=" + actId + "&gifbagid=" + giftbagid + "&orderType=" + 3);
... ... @@ -584,7 +596,7 @@ Page({
584 596 getApp().showWarning("请稍后重试");
585 597 }
586 598 },
587   - // 判断助力活动是不是存在
  599 + // 判断助力活动是不是存在
588 600 is_assistance: function() {
589 601 var th = this;
590 602 rq.get("/api/weshop/marketing/help/act/judge", {
... ... @@ -607,4 +619,4 @@ Page({
607 619  
608 620  
609 621  
610   -})
611 622 \ No newline at end of file
  623 +})
... ...
pages/user/index/index.wxml
  View file @6cdaff7
1 1 <view class="xc-page">
2 2 <view class="xc-user">
3   - <view class="xc-head rel">
4   - <image class="xc-background" src="{{iurl}}/miniapp/images/user_index_powder.jpg">
  3 + <view class="xc-head rel">
  4 + <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
5 5 <view class="flex-space-between abs xc-user-frame">
6 6 <view class="xc-user-left flex" wx:if="{{userInfo}}">
7 7 <image class="xc-user-img circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
... ... @@ -69,19 +69,19 @@
69 69 <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
70 70 <view class="member fs28 "> 加入plus会员预计可省3031元</view>
71 71 </view>
72   - <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
  72 + <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
73 73 <view class="xc-opening fs28">立即开通</view>
74 74 </view>
75 75 </view>
76 76 </view>
77   -
  77 +
78 78 <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3}}">
79 79 <view class="xc-add-member flex-center-around ">
80 80 <view class="flex jc-center ai-center">
81 81 <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
82 82 <view class="member fs28 "> 加入plus会员预计可省3031元</view>
83 83 </view>
84   - <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
  84 + <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
85 85 <view class="xc-opening fs28">立即续费</view>
86 86 </view>
87 87 </view>
... ... @@ -232,7 +232,7 @@
232 232 <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav">
233 233 <image class="xc-center-img " src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
234 234 <view class="four-level-word">助力活动</view>
235   - </view>
  235 + </view>
236 236 </block>
237 237  
238 238 </view>
... ... @@ -262,7 +262,7 @@
262 262 <!-- 显示商品 -->
263 263 <!-- 好物推荐 -->
264 264 <goods_recommend id="goods_recommend"></goods_recommend>
265   -
  265 +
266 266 </view>
267 267 </view>
268 268  
... ... @@ -290,4 +290,4 @@
290 290 </view>
291 291 </view>
292 292  
293   -<pop_txt id="pop_txt"></pop_txt>
294 293 \ No newline at end of file
  294 +<pop_txt id="pop_txt"></pop_txt>
... ...
public/static/images/model/bg.jpg deleted
View file @b8f0596

35.5 KB
public/static/images/model/bg1.jpg deleted
View file @b8f0596

37.2 KB
utils/util.js
  View file @6cdaff7
... ... @@ -236,13 +236,13 @@ function check_mobile(phoneMobile){
236 236 var ob={code:1};
237 237 if (phoneMobile.length === 0) {
238 238 ob.title='输入的手机号为空';
239   - ob.code=-1;
  239 + ob.code=-1;
240 240 } else if (phoneMobile.length < 11) {
241 241 ob.title ='手机号长度有误！';
242   - ob.code = -1;
  242 + ob.code = -1;
243 243 } else if (!myreg.test(phoneMobile)) {
244 244 ob.title = '手机号格式有误！';
245   - ob.code = -1;
  245 + ob.code = -1;
246 246 }
247 247 return ob;
248 248 }
... ... @@ -280,31 +280,31 @@ function draw_randon_rect(ctx,x,y,r,w,h){
280 280 // ctx.setStrokeStyle('transparent')
281 281 // 左上角
282 282 ctx.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5)
283   -
  283 +
284 284 // border-top
285 285 ctx.moveTo(x + r, y)
286 286 ctx.lineTo(x + w - r, y)
287 287 ctx.lineTo(x + w, y + r)
288 288 // 右上角
289 289 ctx.arc(x + w - r, y + r, r, Math.PI * 1.5, Math.PI * 2)
290   -
  290 +
291 291 // border-right
292 292 ctx.lineTo(x + w, y + h - r)
293 293 ctx.lineTo(x + w - r, y + h)
294 294 // 右下角
295 295 ctx.arc(x + w - r, y + h - r, r, 0, Math.PI * 0.5)
296   -
  296 +
297 297 // border-bottom
298 298 ctx.lineTo(x + r, y + h)
299 299 ctx.lineTo(x, y + h - r)
300 300 // 左下角
301 301 ctx.arc(x + r, y + h - r, r, Math.PI * 0.5, Math.PI)
302   -
  302 +
303 303 // border-left
304 304 ctx.lineTo(x, y + r)
305   - ctx.lineTo(x + r, y)
  305 + ctx.lineTo(x + r, y)
306 306 // 这里是使用 fill 还是 stroke都可以，二选一即可，但是需要与上面对应
307   - ctx.fill();
  307 + ctx.fill();
308 308 }
309 309  
310 310 /**
... ... @@ -324,7 +324,7 @@ function get_box_arr(num,x,y,sp,r){
324 324  
325 325 /**
326 326 * @param {Object} ctx 画图句柄
327   - * @param {Object} x x坐标
  327 + * @param {Object} x x坐标
328 328 * @param {Object} y y坐标
329 329 * @param {Object} img 画的图片
330 330 * @param {Object} color 边框的颜色
... ... @@ -345,7 +345,7 @@ function draw_circle(ctx,x,y,r,img,color,unit){
345 345  
346 346  
347 347 function null_promise(){
348   - var promise=new Promise(function(resolve, reject){ var ob={code:-1,data:null}; resolve(ob); }); return promise;
  348 + var promise=new Promise(function(resolve, reject){ var ob={code:-1,data:null}; resolve(ob); }); return promise;
349 349 }
350 350  
351 351 module.exports = {
... ... @@ -371,9 +371,11 @@ module.exports = {
371 371 for (var o in n) new RegExp("(" + o + ")").test(r) && (r = r.replace(RegExp.$1, 1 == RegExp.$1.length ? n[o] : ("00" + n[o]).substr(("" + n[o]).length)));
372 372 return r;
373 373 },
374   - formar_no_full(e){
  374 + formar_no_full(e,char){
375 375 var t= new Date(1e3 * e);
376   - return t.getFullYear() +"-"+(t.getMonth() + 1)+"-"+t.getDate();
  376 + var c="-";
  377 + if(char) c=char;
  378 + return t.getFullYear() +c+(t.getMonth() + 1)+c+t.getDate();
377 379 },
378 380  
379 381 json2Form: function(e) {
... ... @@ -442,7 +444,7 @@ module.exports = {
442 444 sub_last: sub_last,//去掉末尾一个字符
443 445 measureText: measureText,//画布需要的函数
444 446 check_mobile: check_mobile,//验证手机
445   - get_rand_item:get_rand_item, //随机获取元素
  447 + get_rand_item:get_rand_item, //随机获取元素
446 448 getDistance:getDistance, //获取俩个经纬网度之间的距离
447 449 draw_randon_rect:draw_randon_rect ,//画图画圆角矩形
448 450 null_promise:null_promise,//返回空的promise
... ...