Merge branch 'dev' into 'test'

Dev See merge request !203

Merge branch 'dev' into 'test'
Dev See merge request !203
后端研发-苏明海
2 parents 172231a1 d4f24df0
Showing 3 changed files with 30 additions and 6 deletions
pages/user/labels/labels.js
pages/user/labels/labels.wxml
pages/user/labels/labels.wxss
@@ -10,11 +10,13 @@ Page({
    */
   data: {
     url: a.url, //接口网址
+    iurl: a.imghost,//图片前缀网址
     interest_lables: [], //兴趣标签   
     check_label: [], //用户选中的标签集合
     user_label_val: "", //奖励多少
     user_label_type: "", //奖励类型（1积分，1成长值）
     is_modify: 0, //判断是第一次填写还是修改（0填写，1修改）
+    isread:0,//是否读取
   },
   //点击选择兴趣标签把值放到已选中
   click_label: function(e) {
@@ -110,11 +112,15 @@ Page({
     }).then(res => {
       if (res.data.code == 0) {
         th.setData({
-          interest_lables: res.data.data.pageData
+          interest_lables: res.data.data.pageData,
+          isread:1
         })
         th.query_checklabels();
       } else {
         getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+        th.setData({
+          isread: 1
+        })
         return false;
       }
     })
@@ -149,7 +155,7 @@ Page({
           }
         }
         //如何有之前有选择兴趣标签的话，再进来的话就是修改
-        if (data.VipLabelId != "") {
+        if (data.VipLabelId !='') {
           th.setData({
             is_modify: 1
           })
@@ -169,16 +175,17 @@ Page({
     var th = this;
     var is_modify = th.data.is_modify; //是否是修改
     var check_label = th.data.check_label; //用户选择
+    var user_label_val = th.data.user_label_val; //选择标签奖励多少
     var remark = "领取";
+    var user_label_type = th.data.user_label_type; //赠送类型
     if (is_modify) {
       user_label_type = 0;
       remark = "修改";
+      user_label_val = 0;
     }
     if (check_label.length < 1) {
       getApp().my_warnning("完成兴趣标签才能" + remark + "哦~", 0, th);
     } else {
-      var user_label_val = th.data.user_label_val; //选择标签奖励多少
-      var user_label_type = th.data.user_label_type; //赠送类型
       var url = "/api/weshop/marketing/holiday/vip/interest/label/update"; //更新标签接口地址
       var nav_url = "/pages/user/userinfo/userinfo"; //领取成功之后跳转页面
       var vipLabel = ""; //选择的标签名称
@@ -196,7 +203,7 @@ Page({
         }
       }
       var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-      remark = "标签赠送";
+      remark = "兴趣标签赠送";
       if (is_modify) {
             my_confirm.open_cancel(0);
-<view class="container">
+<view wx:if="{{interest_lables.length>0}}" class="container">
   <!-- 兴趣标签集合 -->
   <view class="lables padding">
     <!-- 兴趣标签标题 -->
@@ -53,6 +53,18 @@
     </block>
 </view>
+
+<view wx:if="{{interest_lables.length<1 &&  isread}}" class="flex-center fs30" style="overflow: hidden;margin-top:40%;">
+<view>
+ <view class="flex-center">
+    <image class="no_labels" src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
+  </view>
+  <view>
+     <view>商家还未设置标签，敬请期待！</view>
+     </view>
+     </view>
+</view>
+
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <my_confirm id="my_confirm"></my_confirm>
 \ No newline at end of file
@@ -87,4 +87,9 @@ page{
 }
 .check_item{
   height: 30%;
+}
+.no_labels{
+  width: 290rpx;
+  height: 220rpx;
+  margin-bottom:40rpx;
 }
 \ No newline at end of file