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

taiyuan
2 parents 5c1dbc49 64128ee3
Showing 7 changed files with 158 additions and 116 deletions
components/qr_code/qr_code.js
pages/user/index/index.js
pages/user/user_spsy/user_spsy.js
pages/user/user_spsy/user_spsy.json
pages/user/user_spsy/user_spsy.wxml
pages/user/user_spsy/user_spsy.wxss
pages/user/userqy/userqy.js
@@ -24,6 +24,7 @@ Component({
     //关闭
     close: function (e) {
         this.setData({q_show: 0,barcode_canvas:null,qrcode_canvas:null });
+        this.triggerEvent('close',{},{bubbles: true});
     },
     //打开
@@ -652,7 +652,8 @@ Page({
         getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
         break;
       case "03":
-        getApp().goto("/pages/user/user_spsy/user_spsy");
+        getApp().goto("/pages/user/user_spsy/user_spsy?img=" +
+        url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
         break;
       case "10":
         getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", {
 // pages/user/usersy/usersy.js
-var e = getApp(),os = e.globalData.setting;
-var utils = require('../../../utils/util.js');
+var e = getApp(),
+  os = e.globalData.setting;
+var ut = require('../../../utils/util');
 var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
@@ -8,27 +9,100 @@ Page({
    * 页面的初始数据
    */
   data: {
-    qr_code_object:{val:"12121",content:"请将二维码展示给核销员，取货更快捷！"},
-    xp_list:null,
-    iurl:os.imghost,
+    qr_code_object: {},
+    xp_list: null,
+    iurl: os.imghost,
+    page: 1,
+    isLoading: 0,
+    no_more: 0,
+    is_use:0 //领取状态
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) { },
+  onLoad: function (options) {
+    var h_pic = options.img;
+    if (h_pic.indexOf("http") == -1) {
+      h_pic = os.imghost + h_pic;
+    }
+    var FormId = options.FormId;
+    var GradeId = options.gradeId;
+    var now = ut.gettimestamp();
+    this.setData({
+      h_pic,
+      GradeId,
+      FormId,
+      now,
+    });
+    this.requestData()
+    this.getQrCode(FormId)
+  },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow:async function () {
-    var th = this;
-    var xp_list=null;
-    //--获取列表--
-    await getApp().request.promiseGet("http://172.20.3.102:8080/api/user_qy/xp_list", {
-      1: 1
-    }).then(res => {
-      xp_list = res.data;
-    })
-    th.setData({xp_list:xp_list});
+  onShow: function () {
+
+
+  },
+ async getQrCode(id) {
+    const res = await getApp().request.promiseGet("/api/weshop/users/grade/wares/code/get", {
+      data: {
+        privilegeId: id,
+        storeId: os.stoid,
+        userId: getApp().globalData.user_id,
+      },
+    });
+    if (res.data.code == 0 && res.data.data) {
+      if(res.data.data.VerifyDate || res.data.data.VerifyNo){
+        this.setData({
+          is_use:1
+        })
+      }else{
+        this.setData({
+          qr_code_object: res.data.data,
+        })
+      }
+    }
+  },
+  async requestData() {
+    if (this.data.no_more) return false;
+    if (this.data.isLoading) return false;
+    this.data.isLoading = 1;
+    let {
+      GradeId,
+      FormId,
+      page,
+      xp_list
+    } = this.data;
+    let req_data = {
+      page,
+      GradeId,
+      FormId,
+      storeId: os.stoid,
+      userId: getApp().globalData.user_id,
+    }
+    const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", {
+      data: req_data
+    });
+
+    if (ut.ajax_ok(res)) {
+      if (res.data.data.page > 1) {
+        xp_list = xp_list.concat(res.data.data.pageData);
+      } else {
+        xp_list = res.data.data.pageData;
+      }
+      this.setData({
+        xp_list,
+        isLoading: 0,
+        no_more: 0,
+      })
+    } else {
+      this.setData({
+        xp_list: [],
+        isLoading: 0,
+        no_more: 0,
+      })
+    }
   },
   /**
    * 页面上拉触底事件的处理函数
@@ -46,26 +120,36 @@ Page({
   /*-- 打开服务项目 --*/
-  open_xp:function (e) {
-    var th=this;
+  open_xp: function (e) {
+    var th = this;
     var qc_com = this.selectComponent("#qc_com"); //组件的id
     qc_com.open(th.data.qr_code_object)
   },
   //--领取商品--
-  get_xp:function (e) {
-      var th=this,index=e.currentTarget.dataset.ind;
-      getApp().request.post("http://172.20.3.102:8080/api/user_qy/get_gd",{
-          data:{},
-          success:function (e) {
-              if(e.data.code==0){
-                    var txt="xp_list["+index+"].is_get"
-                    var obj={};obj[txt]=1;
-                    th.setData(obj);
-              }
-          }
+  async show_hxm(e) {
+    let qr_code_object = this.data.qr_code_object;
+    if (qr_code_object !== {}) {
+      let { Number: val, BeginDate, EndDate} = qr_code_object;
+      let qr_code = this.selectComponent("#qc_com");
+      let obj = {
+        val,
+        content: "请将二维码展示给核销员，抵券更快捷",
+        now: BeginDate,
+        validay: EndDate,
+        is_quan: 1,
+      };
+      qr_code.open(obj)
+    }else{
+      wx.showToast({
+        title: "获取失败",
+        icon: 'none',
+        duration: 1000
       })
-  }
-
+    }
+  },
+  close:function (){
+    this.getQrCode(this.data.FormId)
+  }
 })
 \ No newline at end of file
 {
-  "navigationBarTitleText": "新品试用",
+  "navigationBarTitleText": "免费领取",
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code"
   }
-<view class="xc-page" >
-   <view class="items"  wx:for="{{xp_list}}">
-        <view class="rel">
-              <image class="new-product" src="{{iurl+item.img}}"></image>
-              <image  wx:if="{{item.is_get}}" class="abs zimg" src="{{iurl}}/miniapp//images/userqy/isgeted.png"></image>
-          </view>
-
-       <view class="product-explain three-level-word">{{item.goods_name}}</view>
-         <view class="xc-bottom flex">
-            <view class="xc-goods-money three-level-word ">￥
-           </view>
-            <view class="xc-money">
-            {{item.goods_price}}
-            </view>
-            <view class="xc-clike-get  t-c white"  data-ind="{{index}}"  bindtap="open_xp"  wx:if="{{item.is_get}}">立即使用</view>
-            <view class="xc-clike-get  t-c white"  data-ind="{{index}}"  bindtap="get_xp"  wx:else>免费领取</view>
-         </view>
-</view>
+<view>
+  <image class="xc-coupon-img" src="{{h_pic}}"></image>
+  <view class="flex pd20 jc_sb fs28">
+    <view>单品名称</view>
+    <view>数量</view>
+  </view>
+  <view class="flex pd20 jc_sb fs26" wx:for="{{xp_list}}" wx:key="id">
+    <view>{{item.PrivilegeName}}</view>
+    <view class="c-a4">x{{item.SecondNo}}</view>
+  </view>
+  <view class="btn-container">
+    <!-- <view wx:if="{{details.isget}}" data-type="1" class="btn" style="background-color:#aaa;color: #fff">
+      已使用{{list[0].freebh}}
+   </view> -->
+    <view wx:if="{{is_use}}" class="btn">已使用</view>
+    <view wx:else bindtap="show_hxm" data-type="1" class="btn">立即使用</view>
+    <!-- <view bindtap="right_use" class="btn">立即使用</view></view> -->
+  </view>
 </view>
 <!-- 弹出框扫描 -->
-<qr_code id="qc_com"></qr_code>
-
-
-
-
-
-
+<qr_code id="qc_com" bindclose="close"></qr_code>
 \ No newline at end of file
@@ -3,66 +3,28 @@ page{
   height: 100%;
   background:#f4f5fa;
 }
-.xc-page{
-  width: 100%;
-  height: 100%;
-  background: #f4f5fa;
-}
-.xc-page .items{
-  display: inline-block;
-  width: 345rpx;
-  height:450rpx;
-  margin-left:20rpx;
-  margin-top: 25rpx;
-  border-radius: 15rpx;
-  background:#fff;
-}
-
-.xc-page .items  .zimg{
-  width: 120rpx;
-  height: 120rpx;
-  left:50%; top:50%;
-  margin-left: -60rpx; margin-top: -60rpx;
-}
-
-.new-product{
-  width:345rpx;
-  height:325rpx;
-  border-radius:15rpx 15rpx 0 0;
-}
-.product-explain{
-  width: 90%;
-  word-break:break-all;
-  height: 40rpx;
-  margin-left:15rpx;
- 
-}
-.xc-bottom{
-  margin-top: 13rpx;
+.xc-coupon-img{
   width: 100%;
-  margin-left: 15rpx;
-}
-
-.xc-bottom .xc-goods-money{
-color: #ca4e59;
-  padding-top: 12rpx;
-}
-.xc-bottom .xc-money{
- color: #ca4e59;
-  font-size: 40rpx;
-  height: 100%;
-  line-height:50rpx
+  height: 330rpx;
+}
+.btn-container {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	/* padding: 20rpx 30rpx; */
+	box-sizing: border-box;
+	background-color: white;
+	border-top: 2rpx solid #f2f2f2;
+	z-index: 1;
 }
-.xc-clike-get{
-  width: 120rpx;
-  height: 36rpx;
-  border-radius: 20rpx;
-  background: #ca4e59;
-  line-height:28rpx;
-  font-size:27rpx;
-  margin-left: 120rpx;
-padding-top: 10rpx
+.btn {
+  background-color: #FF6768;
+	color: white;
+	padding: 26rpx;
+	text-align: center;
+	/* border-radius: 8rpx; */
 }
@@ -197,7 +197,7 @@ Page({
               getApp().goto("/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id);
               break;
           case "03":
-              getApp().goto("/pages/user/user_spsy/user_spsy");
+              getApp().goto("/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id);
               break;
           case "10":
               getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get",{