wxd / MShopWeApp

Commit 38249af141c953506a5dcbf5c1657d299f053c32

Authored by DESKTOP-QHAFKU5\iceling
1 parent ad3ae98b

个人资料和兴趣标签的排版已经兴趣标签页面的部分数据填充

Inline Side-by-side
Showing 7 changed files with 390 additions and 307 deletions
pages/user/labels/labels.js
  View file @38249af
1   -// pages/user/labels/labels.js
  1 +var e = getApp(),
  2 + a = e.globalData.setting,
  3 + os = a,
  4 + t = e.request,
  5 + d = e.globalData;
2 6 Page({
3 7  
4 8 /**
5 9 * 页面的初始数据
6 10 */
7 11 data: {
8   - interest_lables: [{
9   - lable: "学生"
10   - }, {
11   - lable: "白领",
12   - check: 0
13   - }, {
14   - lable: "高级蓝领",
15   - check: 0
16   - }, {
17   - lable: "工程师",
18   - check: 0
19   - }, {
20   - lable: "军人",
21   - check: 0
22   - }, {
23   - lable: "公务员",
24   - check: 0
25   - }, {
26   - lable: "网红",
27   - check: 0
28   - }, {
29   - lable: "网红主播",
30   - check: 0
31   - }, {
32   - lable: "辣妈",
33   - }, {
34   - lable: "学生",
35   - check: 0
36   - }, {
37   - lable: "博主",
38   - check: 0
39   - }, {
40   - lable: "学生",
41   - check: 0
42   - }, {
43   - lable: "留学生",
44   - check: 0
45   - }, {
46   - lable: "网红主播",
47   - check: 0
48   - }, {
49   - lable: "学生",
50   - check: 0
51   - }], //兴趣标签
  12 + url: a.url, //接口网址
  13 + interest_lables: [], //兴趣标签
52 14 check_label: [], //用户选中的标签集合
53 15 },
54 16 //点击选择兴趣标签把值放到已选中
... ... @@ -60,16 +22,19 @@ Page({
60 22 var labels_cid = th.data.interest_lables[index].check; //当前标签是否选中
61 23 var labels_check = 'interest_lables[' + index + '].check'; //用于点击标签把点击状态赋值进去
62 24 if (labels_cid) {
63   - check_label = [];
64 25 labels_cid = 0;
  26 + for (var i = 0; i < check_label.length; i++) {
  27 + if (index == check_label[i].id) {
  28 + check_label.splice(i, 1);
  29 + }
  30 + }
65 31 } else {
  32 + var check_new = {
  33 + lable: labels[index].LabelName,
  34 + id: index
  35 + };
66 36 labels_cid = 1;
67   - }
68   - //循环看哪些标签选中
69   - for (var i = 0; i < labels.length; i++) {
70   - if (labels[i].check) {
71   - check_label.push(labels[i].lable);
72   - }
  37 + check_label.push(check_new);
73 38 }
74 39 th.setData({
75 40 [labels_check]: labels_cid,
... ... @@ -77,29 +42,100 @@ Page({
77 42 })
78 43  
79 44 },
80   - // var th = this;
81   - // var evaluate = th.data.is_evaluate; //0为未评价，未评价才可点击标签
82   - // if(evaluate == 0) {
83   - // var index = e.currentTarget.dataset.index;
84   - // var label_id = th.data.labels[index].check;
85   - // var labels = 'labels[' + index + '].check';
86   - // if (label_id) {
87   - // label_id = 0
88   - // } else {
89   - // label_id = 1
90   - // }
91   - // th.setData({
92   - // [labels]: label_id
93   - // })
94   - // }
95   -
  45 + //页面跳转
  46 + goto: function(e) {
  47 + var th = this;
  48 + wx.navigateBack({ //返回
  49 + delta: 1
  50 + })
  51 + },
96 52 /**
97 53 * 生命周期函数--监听页面加载
98 54 */
99 55 onLoad: function(options) {
100   -
  56 + var th = this;
  57 + var pages = getCurrentPages();
  58 + var prevPage = pages[pages.length - 2]; //上一个页面
  59 + //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
  60 + prevPage.setData({
  61 + is_zy: 1
  62 + })
  63 + th.query_nolabels();
  64 + th.query_checklabels();
  65 + },
  66 + //获取标签集合
  67 + query_nolabels: function() {
  68 + var th = this;
  69 + var url = "/api/weshop/marketing/holiday/vip/interest/label/page";
  70 + var interest_lables = th.data.interest_lables; //兴趣标签集合
  71 + getApp().request.promiseGet(url, {
  72 + data: {
  73 + storeId: a.stoid
  74 + }
  75 + }).then(res => {
  76 + if (res.data.code == 0) {
  77 + th.setData({
  78 + interest_lables: res.data.data.pageData
  79 + })
  80 + } else {
  81 + getApp().my_warnning(res.data.msg, 0, th);
  82 + }
  83 + })
  84 + },
  85 + //查找会员选择的兴趣标签
  86 + query_checklabels: function() {
  87 + var th = this;
  88 + var url = "/api/weshop/marketing/holiday/vip/interest/label/get";
  89 + var interest_lables = th.data.interest_lables; //兴趣标签集合
  90 + getApp().request.promiseGet(url, {
  91 + data: {
  92 + userId: d.user_id,
  93 + storeId: a.stoid
  94 + }
  95 + }).then(res => {
  96 + if (res.data.code == 0) {
  97 + th.setData({
  98 + check_label: res.data.data.pageData
  99 + })
  100 + } else {
  101 + getApp().my_warnning(res.data.msg, 0, th);
  102 + }
  103 + })
  104 + },
  105 + //更新会员兴趣标签
  106 + update_label: function() {
  107 + var th = this;
  108 + var check_label = th.data.check_label;
  109 + if (check_label.length < 1) {
  110 + getApp().my_warnning("完成兴趣标签才能领取哦~", 0, th);
  111 + return false;
  112 + }
  113 + var url = th.data.url + "/api/weshop/marketing/holiday/vip/interest/label/update";
  114 + check_label = "美,美";
  115 + var json = {
  116 + "storeId": a.stoid,
  117 + "userId": d.user_id,
  118 + "vipLabel": check_label,
  119 + "type":0,
  120 + "vipLabelId":"1,1"
  121 + };
  122 + var data = JSON.stringify(json);
  123 + wx.request({
  124 + url: url,
  125 + data: data,
  126 + method: 'put',
  127 + header: {
  128 + 'content-type': 'application/json'
  129 + }, // 设置请求的 header
  130 + success: function(res) {
  131 + if (res.data.code == 0) {
  132 + getApp().my_warnning("领取成功", 1, th);
  133 + } else {
  134 + getApp().my_warnning("领取失败", 1, th);
  135 + }
  136 + }
  137 + })
101 138 },
102   -
103 139 /**
104 140 * 生命周期函数--监听页面显示
105 141 */
... ...
pages/user/labels/labels.json
  View file @38249af
1 1 {
2   - "navigationBarTitleText": "兴趣标签"
  2 + "navigationBarTitleText": "兴趣标签",
  3 + "usingComponents": {
  4 + "warn": "/components/long_warn/long_warn"
  5 + }
3 6 }
4 7 \ No newline at end of file
... ...
pages/user/labels/labels.wxml
  View file @38249af
... ... @@ -4,7 +4,7 @@
4 4 <!-- 兴趣标签标题 -->
5 5 <view class="flex-vertical-between labels_head">
6 6 <view class="fs36">兴趣标签</view>
7   - <view class="skip flex-center fs28">
  7 + <view class="skip flex-center fs28" data-url="/pages/user/userinfo/userinfo" bindtap="goto">
8 8 <view>跳过</view>
9 9 </view>
10 10 </view>
... ... @@ -13,7 +13,7 @@
13 13 <view class="label_aggregate">
14 14 <!-- 单个标签 -->
15 15 <view class="label fs28 ellipsis-1 {{item.check==1?'click':''}}" wx:for="{{interest_lables}}" wx:for-item="item" wx:for-index="index" data-index="{{index}}" bindtap="click_label">
16   - <view>{{item.lable}}</view>
  16 + <view>{{item.LabelName}}</view>
17 17 </view>
18 18 </view>
19 19  
... ... @@ -25,7 +25,7 @@
25 25 <view class="check_labels">
26 26 <view class="check_label ellipsis-1 fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key">
27 27 <view>
28   - {{it}}
  28 + {{it.lable}}
29 29 </view>
30 30 </view>
31 31 </view>
... ... @@ -33,11 +33,10 @@
33 33  
34 34 <view class="flex-center">
35 35 <!-- 领取选择标签的奖励按钮 -->
36   - <view class="receive flex-center fs36">
  36 + <view class="receive flex-center fs36" bindtap="update_label">
37 37 <view>领取200成长值</view>
38 38 </view>
39 39 </view>
40   -
41   -
42   -
43   -</view>
44 40 \ No newline at end of file
  41 +</view>
  42 +<!-- 引入提示组件 -->
  43 +<warn id="warn"></warn>
45 44 \ No newline at end of file
... ...
pages/user/labels/labels.wxss
  View file @38249af
... ... @@ -39,6 +39,7 @@
39 39 margin-bottom: 45rpx;
40 40 }
41 41 .click{
  42 + color: rgb(255,255,255);
42 43 border: 2rpx solid rgb(255, 138, 160);
43 44 background-color: rgb(255, 138, 160);
44 45 }
... ... @@ -64,7 +65,7 @@
64 65 }
65 66 .receive{
66 67 position: fixed;
67   - bottom:100rpx;
  68 + bottom:130rpx;
68 69 width: 620rpx;
69 70 height: 70rpx;
70 71 line-height: 70rpx;
... ... @@ -73,6 +74,6 @@
73 74 border-radius: 40rpx;
74 75 }
75 76 .check_labels{
76   - height: 300rpx;
  77 + height: 280rpx;
77 78 overflow-y: scroll;
78 79 }
79 80 \ No newline at end of file
... ...
pages/user/userinfo/userinfo.js
  View file @38249af
... ... @@ -2,23 +2,24 @@ function e(e, a, r) {
2 2 return a in e ? Object.defineProperty(e, a, {
3 3 value: r,
4 4 enumerable: !0,
5   - configurable: !0,
  5 + configurable: !0,
6 6 writable: !0
7 7 }) : e[a] = r, e;
8   -}
  8 +}
9 9  
10 10 var a = getApp(),
11 11 r = a.globalData.setting,
12 12 t = a.request,
13 13 s = require("../../../utils/common.js"),
14   - util = require("../../../utils/util.js"),ut=util;
  14 + util = require("../../../utils/util.js"),
  15 + ut = util;
15 16  
16 17 var timestamp = Date.parse(new Date());
17 18 var date = new Date(timestamp);
18 19  
19 20 Page({
20 21 data: {
21   - phone:"",
  22 + phone: "",
22 23 url: r.url,
23 24 resourceUrl: r.resourceUrl,
24 25 iurl: r.imghost,
... ... @@ -46,37 +47,53 @@ Page({
46 47 lon: 0,
47 48 only_pk: 0,
48 49 open_ind_store: 0, //哪里打开的门店列表的控制属性
49   - ispwhid:1,//是否隐藏密码显示
50   - isstcsp:1,//是否启动密码消费
51   - isGender:1,//什么性别
52   - iscalendar:1,//是否是农历
53   - consumption:"",//消费密码
54   - identity_card:"",//身份证值
55   - address:"",//地址
56   - openid:"",//openid
57   - pulscardname:"",//puls会员的卡
58   - gradename:"",//会员权益的卡
59   - isBool:"",
60   - sto_sele_id:"",//所属门店id
61   - is_zy:0,
62   -
  50 + ispwhid: 1, //是否隐藏密码显示
  51 + isstcsp: 1, //是否启动密码消费
  52 + isGender: 1, //什么性别
  53 + iscalendar: 1, //是否是农历
  54 + consumption: "", //消费密码
  55 + identity_card: "", //身份证值
  56 + address: "", //地址
  57 + openid: "", //openid
  58 + pulscardname: "", //puls会员的卡
  59 + gradename: "", //会员权益的卡
  60 + isBool: "",
  61 + sto_sele_id: "", //所属门店id
  62 + is_zy: 0, //是否执行onshow
  63 + is_lable_set:"",//是否启用我的兴趣标签
  64 + },
  65 + //通过路径跳转到其他页面
  66 + goto: function(e) {
  67 + var url = e.currentTarget.dataset.url;
  68 + getApp().goto(url);
  69 + },
  70 + //获取配置信息
  71 + get_config: function() {
  72 + var th = this;
  73 + getApp().getConfig2(function(ee) {
  74 + var sms_conf = ee.switch_list;
  75 + sms_conf = JSON.parse(sms_conf);
  76 + th.setData({
  77 + is_lable_set: sms_conf.user_label_set
  78 + })
  79 + })
63 80 },
64 81 //是否启动密码消费
65   - isstcsp:function(){
  82 + isstcsp: function() {
66 83 var th = this;
67 84 var isstcsp = th.data.isstcsp;
68   - if (isstcsp==0){
69   - th.setData({
70   - isstcsp:1
71   - })
72   - }else{
  85 + if (isstcsp == 0) {
  86 + th.setData({
  87 + isstcsp: 1
  88 + })
  89 + } else {
73 90 th.setData({
74 91 isstcsp: 0
75 92 })
76   - }
  93 + }
77 94 },
78 95 //出生日期是否是农历
79   - iscalendar:function(){
  96 + iscalendar: function() {
80 97 var th = this;
81 98 var iscalendar = th.data.iscalendar;
82 99 if (iscalendar == 0) {
... ... @@ -90,21 +107,21 @@ Page({
90 107 }
91 108 },
92 109 //性别
93   - isGender:function(e){
  110 + isGender: function(e) {
94 111 var th = this;
95 112 var sex = e.currentTarget.dataset.sex;
96   - console.log("点击选择性别",sex);
97   - th.setData({
98   - isGender:sex
99   - })
  113 + console.log("点击选择性别", sex);
  114 + th.setData({
  115 + isGender: sex
  116 + })
  117 +
100 118  
101   -
102 119 },
103 120 //密码是否隐藏显示
104   - ispwhid:function(){
  121 + ispwhid: function() {
105 122 var th = this;
106 123 var ispwhid = th.data.ispwhid;
107   -
  124 +
108 125 if (ispwhid == 0) {
109 126 th.setData({
110 127 ispwhid: 1
... ... @@ -505,92 +522,96 @@ Page({
505 522 },
506 523 //------初始化加载----------
507 524 onLoad: function(t) {
508   - console.log("oNLOAD", "你好");
509   - var user=getApp().globalData.userInfo;
510   - if(user.card_field!=''&& user.card_field!=null && user.card_field!=undefined){
511   - var now=ut.gettimestamp();
512   - var str= user.card_expiredate;
513   - var end = new Date(str);
514   - end = Date.parse(end) / 1000;
515   - if(now<end ){
516   - this.puls_user();
517   - }
518   - }
519   -
  525 + var user = getApp().globalData.userInfo;
  526 + if (user.card_field != '' && user.card_field != null && user.card_field != undefined) {
  527 + var now = ut.gettimestamp();
  528 + var str = user.card_expiredate;
  529 + var end = new Date(str);
  530 + end = Date.parse(end) / 1000;
  531 + if (now < end) {
  532 + this.puls_user();
  533 + }
  534 + }
520 535 this.initial_user();
  536 + this.get_config();
521 537 },
522   - //-----------会员是否初始化---------------------
523   - initial_user: function () {
524   -
  538 + //-----------会员是否初始化---------------------
  539 + initial_user: function() {
  540 +
525 541 var th = this;
526 542 getApp().request.get("/api/weshop/users/grade/vip/init/get", {
527 543 data: {
528 544 storeId: r.stoid,
529 545 },
530   - success: function (su) {
  546 + success: function(su) {
531 547 var isBool = su.data.data.isBool;
532 548 console.log("会员是否初始化", isBool);
533   - th.setData({isBool:isBool});
534   -
535   - if(!isBool) return false;
536   - //-----会员权益获取--------------
537   - getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
538   - data: {
539   - storeId: r.stoid,
540   - userId: getApp().globalData.user_id,
541   - },
542   - success: function (su) {
543   - var gradename=su.data.data.GradeName;
544   - th.setData({gradename: gradename});
545   - }
546   - });
547   -
548   - }
549   - });
550   - },
551   -
  549 + th.setData({
  550 + isBool: isBool
  551 + });
  552 +
  553 + if (!isBool) return false;
  554 + //-----会员权益获取--------------
  555 + getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
  556 + data: {
  557 + storeId: r.stoid,
  558 + userId: getApp().globalData.user_id,
  559 + },
  560 + success: function(su) {
  561 + var gradename = su.data.data.GradeName;
  562 + th.setData({
  563 + gradename: gradename
  564 + });
  565 + }
  566 + });
  567 +
  568 + }
  569 + });
  570 + },
  571 +
552 572  
553 573 //-----Plus会员获取-----------
554   - puls_user:function(){
555   - var th=this;
  574 + puls_user: function() {
  575 + var th = this;
556 576 getApp().request.get("/api/weshop/plus/vip/mem/list", {
557 577 data: {
558 578 storeId: r.stoid,
559   - userId: getApp().globalData.user_id, },
560   - success: function (su) {
  579 + userId: getApp().globalData.user_id,
  580 + },
  581 + success: function(su) {
561 582  
562 583 if (su.data.code == 0) {
563   - var cardname=su.data.data[0].MemCardName;
  584 + var cardname = su.data.data[0].MemCardName;
564 585 console.log("卡的名字", cardname);
565   - th.setData({pulscardname:cardname});
  586 + th.setData({
  587 + pulscardname: cardname
  588 + });
566 589 }
567 590 }
568 591 });
569 592 },
570   -
571   - onShow: function() {
572   - console.log(this.data.is_zy ,"是什么东西");
573   - if(this.data.is_zy) return false;
  593 +
  594 + onShow: function() {
  595 + if (this.data.is_zy) return false;
574 596 this.wait_for_store_config();
575   - console.log(this.data.is_zy, "sssss是什么东西");
576 597 var e = this;
577 598 var req = t;
578 599 req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
579   - success: function (src) {
580   - var a=src.data.data;
581   - var time = util.formatTime(a.reg_time,"'Y/M/D");
  600 + success: function(src) {
  601 + var a = src.data.data;
  602 + var time = util.formatTime(a.reg_time, "'Y/M/D");
582 603 var birthday = util.formatTime(a.birthday, "'Y/M/D");
583 604 a.reg_time = time;
584 605 a.birthday = birthday
585 606 e.setData({
586   - phone: a.mobile,
587   - user: a,
588   - openid: a.openid,
589   - sto_sele_id: a.pickup_id,
590   - consumption: a.paypwd,
591   - identity_card:a.idcard,
592   - address:a.address,
593   - });
  607 + phone: a.mobile,
  608 + user: a,
  609 + openid: a.openid,
  610 + sto_sele_id: a.pickup_id,
  611 + consumption: a.paypwd,
  612 + identity_card: a.idcard,
  613 + address: a.address,
  614 + });
594 615 }
595 616 })
596 617 a.getUserInfo(function(a) {
... ... @@ -600,10 +621,10 @@ Page({
600 621 var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'),
601 622 arr2 = txt.split(' ');
602 623 a.reg_time = arr2[0];
603   - if (a.pickup_id!=null) {
  624 + if (a.pickup_id != null) {
604 625 req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
605 626 success: function(da) {
606   -
  627 +
607 628 //设置门店
608 629 e.setData({
609 630 stoname: da.data.data.pickup_name
... ... @@ -614,12 +635,12 @@ Page({
614 635 // var phone = "";
615 636 // phone+=a.mobile.substr(0, 3)+"****";
616 637 // phone += a.mobile.substr(7, 12);
617   -
618   -
619   -
620   - // e.setData({
621   - // isGender:e.data.user.sex
622   - // })
  638 +
  639 +
  640 +
  641 + // e.setData({
  642 + // isGender:e.data.user.sex
  643 + // })
623 644 }, !0);
624 645 },
625 646  
... ... @@ -665,134 +686,146 @@ Page({
665 686 });
666 687 },
667 688 //消费密码输入框失去焦点事件
668   - lose_focus:function(e){
669   - var th=this;
670   - var val=e.detail.value;
671   - console.log("是什么东西",val);
672   - if (val.length > 6 || val!=""){
673   -
674   - this.setData({ consumption: val });
  689 + lose_focus: function(e) {
  690 + var th = this;
  691 + var val = e.detail.value;
  692 + console.log("是什么东西", val);
  693 + if (val.length > 6 || val != "") {
  694 +
  695 + this.setData({
  696 + consumption: val
  697 + });
675 698 console.log("是什么东西", val);
676 699 }
677   -
678   -
  700 +
  701 +
679 702 },
680   -
681   -//地址
682   - address:function(e){
  703 +
  704 + //地址
  705 + address: function(e) {
683 706 var val = e.detail;
684 707 console.log("地址55555555", val.value);
685   - this.setData({ address: val.value });
  708 + this.setData({
  709 + address: val.value
  710 + });
686 711 },
687 712  
688 713 //身份证验证
689   - identity_card:function(e){
  714 + identity_card: function(e) {
690 715 var val = e.detail;
691   -
692   - this.setData({ identity_card: val.value });
693   -
  716 +
  717 + this.setData({
  718 + identity_card: val.value
  719 + });
  720 +
694 721 },
695 722 //用户名字
696   - user_name:function(e){
  723 + user_name: function(e) {
697 724 var name = e.detail.value;
698   - if (name !=""||name!=null){
699   -
700   - this.setData({ user_name: name });
701   -
  725 + if (name != "" || name != null) {
  726 +
  727 + this.setData({
  728 + user_name: name
  729 + });
  730 +
702 731 }
703   -
  732 +
704 733 },
705 734  
706 735 //点击确认修改信息
707   - confirm_revision:function(){
708   - var th=this;
709   - var isstcsp=th.data.isstcsp;//是否启用消费密码
710   - var phone=th.data.phone;//手机号码
711   - if (phone == "" || phone==null){
712   - getApp().my_warnning("手机不能为空", 0, th);
713   -
714   - return false;
715   - }
716   -
717   -
718   - var consumption = th.data.consumption;//消费密码
719   - var isstcsp = th.data.isstcsp;
720   - if(isstcsp==1){
721   -
722   - if (consumption==null || consumption=="" || consumption==undefined ){
723   - getApp().my_warnning("消费密码不能为空", 0, th); return false;
724   - }
725   - if (consumption.length < 6){
726   - getApp().my_warnning("消费密码不能小于6位", 0, th); return false;
727   - }
728   - }
729   - var sex = th.data.isGender;//性别
730   -
731   - if (sex!="1"&&sex!="2" ) {
732   - getApp().my_warnning("请选择性别", 0, th);
733   - return false;
734   - }
735   - var user_name = th.data.user.vipname;//用户姓名
736   - console.log("名字77777",user_name);
737   - if (user_name==""|| user_name== null) {
738   - getApp().my_warnning("请输入名字", 0, th);
739   - return false;
740   - }
741   - var identity_card = th.data.identity_card;//身份证
742   - console.log("身份证",identity_card);
743   -
744   - if (identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))){
745   - getApp().my_warnning("身份证号码错误",0, th);
746   - return false;
747   - }
748   - var address = th.data.address;//地址
  736 + confirm_revision: function() {
  737 + var th = this;
  738 + var isstcsp = th.data.isstcsp; //是否启用消费密码
  739 + var phone = th.data.phone; //手机号码
  740 + if (phone == "" || phone == null) {
  741 + getApp().my_warnning("手机不能为空", 0, th);
  742 +
  743 + return false;
  744 + }
  745 +
  746 +
  747 + var consumption = th.data.consumption; //消费密码
  748 + var isstcsp = th.data.isstcsp;
  749 + if (isstcsp == 1) {
  750 +
  751 + if (consumption == null || consumption == "" || consumption == undefined) {
  752 + getApp().my_warnning("消费密码不能为空", 0, th);
  753 + return false;
  754 + }
  755 + if (consumption.length < 6) {
  756 + getApp().my_warnning("消费密码不能小于6位", 0, th);
  757 + return false;
  758 + }
  759 + }
  760 + var sex = th.data.isGender; //性别
  761 +
  762 + if (sex != "1" && sex != "2") {
  763 + getApp().my_warnning("请选择性别", 0, th);
  764 + return false;
  765 + }
  766 + var user_name = th.data.user.vipname; //用户姓名
  767 + console.log("名字77777", user_name);
  768 + if (user_name == "" || user_name == null) {
  769 + getApp().my_warnning("请输入名字", 0, th);
  770 + return false;
  771 + }
  772 + var identity_card = th.data.identity_card; //身份证
  773 + console.log("身份证", identity_card);
  774 +
  775 + if (identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) {
  776 + getApp().my_warnning("身份证号码错误", 0, th);
  777 + return false;
  778 + }
  779 + var address = th.data.address; //地址
749 780 // console.log("地址1010101", address)
750 781 // if (address == "" || address == null) {
751 782 // getApp().my_warnning("请输入地址", 0, th);
752 783 // return false;
753 784 // }
754   - //保存所属门店的id
755   - var sto_sele_id=th.data.sto_sele_id;
  785 + //保存所属门店的id
  786 + var sto_sele_id = th.data.sto_sele_id;
756 787 // console.log("请输入所属门店的id", sto_sele_id);
757 788 // if (sto_sele_id == null || sto_sele_id==""){
758 789 // getApp().my_warnning("请输入所属门店", 0, th);
759 790 // return false;
760 791 // }
761   - console.log("要保存的数据", sex, consumption, identity_card, address, user_name);
762   - var datas = {
763   - mobile: phone,//手机号码
764   - store_id: r.stoid,
765   - user_id: getApp().globalData.user_id,
766   - vipnopwd: isstcsp,
767   - vippass: consumption,//消费密码
768   - sex: sex,//性别
769   - nickname:user_name,//昵称
770   - idcard:identity_card,//身份证
771   - address:address,//地址
772   - pickup_id: sto_sele_id//自提门店 所属门店
773   - }
774   - getApp().request.put("/api/weshop/users/updateUserInfo", {
775   - data: datas,
776   - success: function (res) {
777   -
778   - if (res.data.code==0){
779   - getApp().showWarning("修改成功");
780   - }else{
781   - getApp().showWarning("修改失败");
782   - }
783   -
784   - }
785   - })
786   - } ,
787   - //选择地址
788   - goto_address:function(){
789   - // this.setData({ is_zy: 1 });
790   - },
791   - //更换手机
792   - go_phone:function(e){
793   - var url=e.currentTarget.dataset.url;
794   - this.setData({is_zy:1});
795   - getApp().goto(url);
796   - }
797   -
  792 + console.log("要保存的数据", sex, consumption, identity_card, address, user_name);
  793 + var datas = {
  794 + mobile: phone, //手机号码
  795 + store_id: r.stoid,
  796 + user_id: getApp().globalData.user_id,
  797 + vipnopwd: isstcsp,
  798 + vippass: consumption, //消费密码
  799 + sex: sex, //性别
  800 + nickname: user_name, //昵称
  801 + idcard: identity_card, //身份证
  802 + address: address, //地址
  803 + pickup_id: sto_sele_id //自提门店 所属门店
  804 + }
  805 + getApp().request.put("/api/weshop/users/updateUserInfo", {
  806 + data: datas,
  807 + success: function(res) {
  808 +
  809 + if (res.data.code == 0) {
  810 + getApp().showWarning("修改成功");
  811 + } else {
  812 + getApp().showWarning("修改失败");
  813 + }
  814 +
  815 + }
  816 + })
  817 + },
  818 + //选择地址
  819 + goto_address: function() {
  820 + // this.setData({ is_zy: 1 });
  821 + },
  822 + //更换手机
  823 + go_phone: function(e) {
  824 + var url = e.currentTarget.dataset.url;
  825 + this.setData({
  826 + is_zy: 1
  827 + });
  828 + getApp().goto(url);
  829 + }
  830 +
798 831 });
799 832 \ No newline at end of file
... ...
pages/user/userinfo/userinfo.wxml
  View file @38249af
... ... @@ -187,21 +187,21 @@
187 187 </view>
188 188 </view>
189 189 <!-- 我的兴趣 -->
190   - <view class="padding Bbottom">
  190 + <view wx:if="{{is_lable_set!=null || is_lable_set==1 || true}}" class="padding Bbottom">
191 191 <view class="interest fs28">
192   - <view class="flex-vertical-between">
  192 + <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
193 193 <view class="fs30">我的兴趣</view>
194 194 <view class="angle">∟</view>
195 195 </view>
196 196 <!-- 选中的标签 -->
197   - <view class="lables flex">
198   - <view class="lable">
199   - <view>白领</view>
  197 + <view class="lables">
  198 + <view class="lable" wx:for="{{4}}">
  199 + <view class="ellipsis-1 lable_wh">高级蓝领</view>
200 200 </view>
201 201 <!-- 添加标签按钮 -->
202   - <view class="add_lable flex-center">
203   - <view class="fs36 plus">+</view>
204   - <view>标签</view>
  202 + <view class="add_lable ib" bindtap="goto" data-url="/pages/user/labels/labels">
  203 + <text class="fs36">+</text>
  204 + <text>标签</text>
205 205 </view>
206 206 </view>
207 207 </view>
... ...
pages/user/userinfo/userinfo.wxss
  View file @38249af
... ... @@ -612,17 +612,20 @@ input {
612 612 .s_btn {
613 613 margin-top: 25rpx;
614 614 }
615   -.padding{
616   - padding:0rpx 20rpx;
617   -
  615 +
  616 +.padding {
  617 + padding: 0rpx 20rpx;
618 618 }
619   -.interest{
620   - padding:0rpx 20rpx;
  619 +
  620 +.interest {
  621 + padding: 0rpx 20rpx;
621 622 padding-top: 30rpx;
622 623 padding-bottom: 30rpx;
623 624 }
  625 +
624 626 .lables {
625   - max-height: 200rpx;
  627 + display: inline-block;
  628 + max-height: 125rpx;
626 629 overflow-y: scroll;
627 630 padding-top: 25rpx;
628 631 padding-bottom: 20rpx;
... ... @@ -630,24 +633,32 @@ input {
630 633  
631 634 .lable {
632 635 display: inline-block;
633   - height: 46rpx;
634   - line-height: 46rpx;
  636 + /* height: 46rpx; *//* line-height: 46rpx; */
635 637 margin-right: 15rpx;
636 638 color: rgb(255, 255, 255);
637   - border:2rpx solid rgb(255, 138, 160);
  639 + border: 2rpx solid rgb(255, 138, 160);
638 640 background-color: rgb(255, 138, 160);
639 641 padding: 0rpx 25rpx;
640 642 border-radius: 30rpx;
  643 + margin-bottom: 20rpx;
  644 + max-width: 195rpx;
641 645 }
642 646  
643 647 .add_lable {
644   - width: 110rpx;
645   - height: 46rpx;
646   - line-height: 46rpx;
  648 + width: 88rpx;
  649 + /* height: 46rpx; *//* line-height: 46rpx; */
647 650 color: rgb(189, 189, 189);
648   - border:2rpx solid rgb(189, 189, 189);
  651 + border: 2rpx solid rgb(189, 189, 189);
649 652 border-radius: 30rpx;
  653 + margin-bottom: 20rpx;
  654 + padding: 0rpx 25rpx;
650 655 }
651   -.plus{
  656 +
  657 +.plus {
652 658 font-weight: bold;
653   -}
654 659 \ No newline at end of file
  660 +}
  661 +
  662 +.lable_wh {
  663 + height: 46rpx;
  664 + line-height: 46rpx;
  665 +}
... ...