guhongwei 4 سال پیش
والد
کامیت
5ec0a46e22
4فایلهای تغییر یافته به همراه54 افزوده شده و 15 حذف شده
  1. 39 6
      pages/car/car.js
  2. 2 2
      pages/integral/integral.wxml
  3. 10 4
      pages/perssonal/perssonal.js
  4. 3 3
      pages/perssonal/perssonal.wxml

+ 39 - 6
pages/car/car.js

@@ -8,24 +8,57 @@ Page({
     // tab
     // tab
     active: 0,
     active: 0,
     // 是否可以领取积分
     // 是否可以领取积分
-    disabled: false
+    disabled: false,
+    // 用户信息
+    userInfo: {}
   },
   },
   //事件处理函数
   //事件处理函数
   receiveBtn: function () {
   receiveBtn: function () {
-    wx.showToast({
-      title: '领取积分成功',
-      icon: 'success',
-      duration: 2000
+    let user = this.data.userInfo;
+    wx.request({
+      url: app.globalData.publicUrl + '/api/htyd/carShow/check',
+      method: "get",
+      data: {
+        id: user._id
+      },
+      success: (res) => {
+        if (res.data.errcode === 0) {
+          wx.request({
+            url: app.globalData.publicUrl + '/api/htyd/carShow/getShow',
+            method: "get",
+            data: {
+              id: user._id
+            },
+            success: (arr) => {
+              if (arr.data.errcode === 0) {
+                wx.showToast({
+                  title: '领取积分成功',
+                  icon: 'success',
+                  duration: 2000
+                })
+              }
+            }
+          })
+        } else {
+          wx.showToast({
+            title: '条件不足',
+            icon: 'error',
+            duration: 2000
+          })
+        }
+      }
     })
     })
   },
   },
   onLoad: function () {
   onLoad: function () {
+    // 用户信息
+    let data = app.globalData.userInfo;
+    if (data) this.setData({ userInfo: data })
     // 查询信息
     // 查询信息
     wx.request({
     wx.request({
       url: app.globalData.publicUrl + '/api/htyd/config/car',
       url: app.globalData.publicUrl + '/api/htyd/config/car',
       method: "get",
       method: "get",
       data: {},
       data: {},
       success: (res) => {
       success: (res) => {
-        console.log(res.data.data);
         this.setData({ carInfo: res.data.data })
         this.setData({ carInfo: res.data.data })
       }
       }
     })
     })

+ 2 - 2
pages/integral/integral.wxml

@@ -26,7 +26,7 @@
           </view>
           </view>
         </view>
         </view>
       </van-tab>
       </van-tab>
-      <van-tab title="开卡量">
+      <!-- <van-tab title="开卡量">
         <view class="integral" wx:for="{{cardList}}" wx:key="id">
         <view class="integral" wx:for="{{cardList}}" wx:key="id">
           <view class="list">
           <view class="list">
             <view class="status">
             <view class="status">
@@ -47,7 +47,7 @@
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>
-      </van-tab>
+      </van-tab> -->
       <van-tab title="卡单分红">
       <van-tab title="卡单分红">
         <view class="integral" wx:for="{{bonusList}}" wx:key="id">
         <view class="integral" wx:for="{{bonusList}}" wx:key="id">
           <view class="list">
           <view class="list">

+ 10 - 4
pages/perssonal/perssonal.js

@@ -5,10 +5,14 @@ const app = getApp()
 Page({
 Page({
   data: {
   data: {
     personalInfo: {},
     personalInfo: {},
+    province: '',
+    city: '',
+    set: ''
   },
   },
   //事件处理函数
   //事件处理函数
   onLoad: function () {
   onLoad: function () {
     let data = app.globalData.userInfo;
     let data = app.globalData.userInfo;
+    console.log(data);
     if (data) {
     if (data) {
       // 查询省份
       // 查询省份
       wx.request({
       wx.request({
@@ -16,7 +20,8 @@ Page({
         method: "get",
         method: "get",
         data: { code: data.province },
         data: { code: data.province },
         success: (proRes) => {
         success: (proRes) => {
-          data.province = proRes.data.data[0].name;
+          // data.province = proRes.data.data[0].name;
+          this.setData({ province: proRes.data.data[0].name })
           // 查询市区
           // 查询市区
           wx.request({
           wx.request({
             url: app.globalData.publicUrl + '/api/htyd/xzqh',
             url: app.globalData.publicUrl + '/api/htyd/xzqh',
@@ -24,8 +29,8 @@ Page({
             data: { pcode: proRes.data.data[0].code },
             data: { pcode: proRes.data.data[0].code },
             success: (cityRes) => {
             success: (cityRes) => {
               let city = cityRes.data.data.find(i => i.code == data.city)
               let city = cityRes.data.data.find(i => i.code == data.city)
-              console.log(city);
-              if (city) data.city = city.name;
+              // if (city) data.city = city.name;
+              if (city) this.setData({ city: city.name })
               // 查询套餐
               // 查询套餐
               wx.request({
               wx.request({
                 url: app.globalData.publicUrl + '/api/htyd/set/' + data.set,
                 url: app.globalData.publicUrl + '/api/htyd/set/' + data.set,
@@ -33,7 +38,8 @@ Page({
                 data: {},
                 data: {},
                 success: (setRes) => {
                 success: (setRes) => {
                   if (setRes.data.errcode === 0) {
                   if (setRes.data.errcode === 0) {
-                    data.set = setRes.data.data.title;
+                    // data.set = setRes.data.data.title;
+                    this.setData({ set: setRes.data.data.title })
                     this.setData({ personalInfo: data })
                     this.setData({ personalInfo: data })
                   }
                   }
                 }
                 }

+ 3 - 3
pages/perssonal/perssonal.wxml

@@ -20,13 +20,13 @@
         <van-field value="{{ personalInfo.wxaccount }}" label="微信账号" placeholder="微信账号" readonly />
         <van-field value="{{ personalInfo.wxaccount }}" label="微信账号" placeholder="微信账号" readonly />
       </van-cell-group>
       </van-cell-group>
       <van-cell-group>
       <van-cell-group>
-        <van-field value="{{ personalInfo.province }}" label="省份" placeholder="省份" readonly />
+        <van-field value="{{ province }}" label="省份" placeholder="省份" readonly />
       </van-cell-group>
       </van-cell-group>
       <van-cell-group>
       <van-cell-group>
-        <van-field value="{{ personalInfo.city }}" label="市区" placeholder="市区" readonly />
+        <van-field value="{{city }}" label="市区" placeholder="市区" readonly />
       </van-cell-group>
       </van-cell-group>
       <van-cell-group>
       <van-cell-group>
-        <van-field value="{{ personalInfo.set }}" label="套餐" placeholder="套餐" readonly />
+        <van-field value="{{ set }}" label="套餐" placeholder="套餐" readonly />
       </van-cell-group>
       </van-cell-group>
       <van-cell-group>
       <van-cell-group>
         <van-field value="{{ personalInfo.create_time }}" label="办卡时间" placeholder="办卡时间" readonly />
         <van-field value="{{ personalInfo.create_time }}" label="办卡时间" placeholder="办卡时间" readonly />