8/31 2.2.0待发布

project.private.config.json

@@ -15,8 +15,8 @@
         {
           "name": "pages/index/main",
           "pathName": "pages/index/main",
-          "query": "",
-          "scene": 1007
+          "query": "other=1",
+          "scene": 1001
         },
         {
           "name": "pages/coupons/main",

src/App.vue

@@ -7,14 +7,24 @@ export default {
   },
   //外发
   onLaunch(options){
-      console.log('启动小程序的场景值:', options.scene)
+      // console.log('链接参数',options.query)
+      // console.log('启动小程序的场景值:', options.scene)
       let scene = options.scene
-      if(scene == 1007 || scene == 1008 || scene == 1035 || scene == 1017){
-        console.log('外发给你哦')
+      let query = options.query.other
+      // 场景值
+      if(scene == 1065){
+        console.log('外发给你')
         wx.setStorageSync("is_out", true);
       }else{
         wx.setStorageSync("is_out", false);
       }
+      // 判断是啥券
+      if(query == 1 ){
+        console.log("外发其它券")
+        wx.setStorageSync("is_other", true);
+      }else{
+        wx.setStorageSync("is_other", false);
+      }
   },
   created() {
 

src/components/device/unconnect.vue

@@ -7,7 +7,7 @@
         offset="1"
       >
         <view>1.打开手机蓝牙和位置信息</view>
-        <view>2.长按头环侧面按钮启动头环</view>
+        <view>2.长按脑环侧面按钮启动脑环</view>
         <view>3.点击扫码开始连接</view>
       </van-col>
 

src/components/index/personal.vue

@@ -191,7 +191,7 @@
 
 <script>
 import { userUpdateLoginTime} from "../../requests/user";
-import { couponReceiveFirst, couponReceiveFirstID, outputCoupon, couponReceive } from "../../requests/coupons";
+import { couponReceiveFirst, couponReceiveFirstID, outputCoupon, couponReceive, outCardCoupon } from "../../requests/coupons";
 import Toast from "../../../static/vant/toast/toast";
 import { reload_userinfo } from "../../utils/user";
 import { timestampTwoNum } from "../../utils/index";
@@ -318,21 +318,40 @@ export default {
     
     //获取外发数据
     if($this.output == true){
-      outputCoupon().then((res)=>{
-        if(res.data.code == 0){
-          let $newData = res.data.data
-          $newData.validity_time['start_time_format'] = timestampTwoNum($newData.validity_time['start_time'])
-          $newData.validity_time['end_time_format'] = timestampTwoNum($newData.validity_time['end_time'])
-          $newData.validity_time['time_format'] = timestampTwoNum($newData.validity_time['time'])
+      // 判断外发哪种券
+      if(wx.getStorageSync("is_other") == false){
+         outputCoupon().then((res)=>{
+         if(res.data.code == 0){
+           let $newData = res.data.data
+           $newData.validity_time['start_time_format'] = timestampTwoNum($newData.validity_time['start_time'])
+           $newData.validity_time['end_time_format'] = timestampTwoNum($newData.validity_time['end_time'])
+           $newData.validity_time['time_format'] = timestampTwoNum($newData.validity_time['time'])
 
-          $this.outCouponData = $newData
-          console.log('外发数据：',$this.outCouponData)
-          $this.is_outShow = true
-        }else{
-          wx.setStorageSync("is_out", false);
-          $this.output = false
-        }
-      })
+           $this.outCouponData = $newData
+           console.log('外发数据：',$this.outCouponData)
+           $this.is_outShow = true
+         }else{
+           wx.setStorageSync("is_out", false);
+           $this.output = false
+         }
+       })
+      }else{
+        outCardCoupon().then((res)=>{
+         if(res.data.code == 0){
+           let $newData = res.data.data
+           $newData.validity_time['start_time_format'] = timestampTwoNum($newData.validity_time['start_time'])
+           $newData.validity_time['end_time_format'] = timestampTwoNum($newData.validity_time['end_time'])
+           $newData.validity_time['time_format'] = timestampTwoNum($newData.validity_time['time'])
+
+           $this.outCouponData = $newData
+           console.log('外发数据：',$this.outCouponData)
+           $this.is_outShow = true
+         }else{
+           wx.setStorageSync("is_out", false);
+           $this.output = false
+         }
+       })
+      }  
     }
 
     //判断是否每月20号
@@ -363,11 +382,6 @@ export default {
 
 
 <style scoped>
-@font-face {
-  font-family: Microsoft YaHei;
-  src: url("https://img.shuimuai.com/MSYH.TTC");
-}
-
 .userinfoYellow {
   background-image: url("https://img.shuimuai.com/huiyuankadiban.png");
   background-position: center;

src/pages/competition/index.vue

@@ -6,7 +6,6 @@
     scroll-y
     style="height: 100%;"
     :scroll-into-view="scroll_id"
-    scroll-y
   >
     <!--    死底部分-->
     <div class="index_container">
@@ -569,7 +568,7 @@
             <div class="rank_list_ext">
 
               <div
-                v-for="(item,index) in all_final_rank"
+                v-for="item in all_final_rank"
                 :key="item"
               >
 
@@ -977,6 +976,10 @@ export default {
   onLoad($options) {
     $this.activity_id = $options.activity_id;
     $this.getActivity($this.activity_id);
+    wx.showShareMenu({
+			withShareTicket: true,
+			menus: ['shareAppMessage', 'shareTimeline']
+		})
   },
   onShareAppMessage() {
     return {
@@ -985,6 +988,12 @@ export default {
       path: "/pages/competition/main?activity_id=" + $this.activity_id,
     };
   },
+  onShareTimeline () {
+		return {
+	      title: '欢迎参加 “专注勇士PK赛”',
+	      imageUrl: ''
+	    }
+	},
 };
 </script>
 <style>

src/pages/user_center/confirmPay/index.vue

@@ -30,7 +30,7 @@
         </view>
        
         <view v-if="data.coupon.length == 0 & data.discount * 10 !== 10" class="padding-tb">
-          <text class="text-lg text-red" style="font-weight: bold;">折扣&emsp;{{ data.discount * 10 }}折</text>
+          <text class="text-lg text-red" style="font-weight: bold;">{{data.represent}}&emsp;{{ data.discount * 10 }}折</text>
           <br>
         </view>
         <view v-if="data.goods_id < 4" class="padding-tb">

src/requests/coupons.js

@@ -65,7 +65,7 @@ export function payCoupon($item) {
   return fly.get('coupon/choose-coupon', $params)
 }
 
-// 外发卡券信息
+// 外发卡券信息(无参数)
 export function outputCoupon() {
   let $params = {
     "access_token": wx.getStorageSync('token'),
@@ -73,3 +73,10 @@ export function outputCoupon() {
   return fly.post('coupon/out-list', $params)
 }
 
+// 外发卡券信息(有other参数)
+export function outCardCoupon() {
+  let $params = {
+    "access_token": wx.getStorageSync('token'),
+  }
+  return fly.post('coupon/out-card', $params)
+}

src/utils/bluetooth.js

@@ -302,6 +302,7 @@ export default {
         wx.showToast({
           title: "脑环电量不足",
           icon: "none",
+          duration: 2000,
           success() {
             // $this.change_device_status(0);
           },