转盘页面更新，星探计划页面更新（测试版本）

496_dongfengqichen/app.js

@@ -83,10 +83,10 @@ App({
     })
   },
   globalData: {
-    // urlRoot: "https://dongfengqichen.jiyou-tech.com/",//测试接口根目录
-    urlRoot: "https://xing.venucia.com/api/",//接口根目录
-    // urlStatic: "https://www.jiyou-tech.com/2020/496_qichen/static",//测试静态资源根目录
-    urlStatic: "https://xingb.venucia.com/resource",//静态资源根目录
+    urlRoot: "https://dongfengqichen.jiyou-tech.com/",//测试接口根目录
+    // urlRoot: "https://xing.venucia.com/api/",//接口根目录
+    urlStatic: "https://www.jiyou-tech.com/2020/496_qichen/static",//测试静态资源根目录
+    // urlStatic: "https://xingb.venucia.com/resource",//静态资源根目录
     openid: "",//OPENID
     parentOpenid:"",//推荐人的openid
     session_key: "",//session_key

496_dongfengqichen/pages/index/index.wxml

@@ -6,7 +6,7 @@
         <!-- <image style="width:750rpx;height:11693rpx;" src="{{imgUrl+'/newImages8/newHome/newHomeBg.png'}}"></image> -->
         <!-- <image style="width:750rpx;height:10368rpx;" src="{{imgUrl+'/newImages4/16.png'}}"></image> -->
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_01.png?v=003'}}"></image>
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_02.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_02.png?v=003'}}"></image>
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_03.png'}}"></image>
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_04.png'}}"></image>
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages8/newHome2/images/newHome2_05.png'}}"></image>

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxml

@@ -2,12 +2,12 @@
 <view class="all">
   <view class="main">
     <view class="titleText">兑换详情</view>
-    <view class="lineSty" wx:if="{{lookIndex.awardId!=19 && lookIndex.awardId!=20 && lookIndex.awardId!=23}}"></view>
+    <view class="lineSty" wx:if="{{lookIndex.awardId<19 || lookIndex.awardId>=24}}"></view>
     <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
-    <view wx:if="{{lookIndex.awardId<6 || lookIndex.awardId==19 || lookIndex.awardId==20 || lookIndex.awardId==23}}" style="position: relative;">
-      <image wx:if="{{lookIndex.awardId==19 || lookIndex.awardId==20 || lookIndex.awardId==23}}" src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'.jpg'}}" style="width:750rpx;" mode="widthFix"></image>
+    <view wx:if="{{lookIndex.awardId<6 || lookIndex.awardId>=19 && lookIndex.awardId<=24}}" style="position: relative;">
+      <image wx:if="{{lookIndex.awardId>=19 && lookIndex.awardId<=24}}" src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'.jpg'}}" style="width:750rpx;" mode="widthFix"></image>
       <image wx:if="{{lookIndex.awardId<6}}" src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'.png'}}" style="width:750rpx;" mode="widthFix"></image>
-      <image class="confirm" wx:if="{{lookIndex.awardId!=19 && lookIndex.awardId!=20 && lookIndex.awardId!=23}}" bindtap="closeXieyi" src="{{imgUrl+'/newImages3/35.png'}}"></image>
+      <image class="confirm" wx:if="{{lookIndex.awardId<19 || lookIndex.awardId>24}}" bindtap="closeXieyi" src="{{imgUrl+'/newImages3/35.png'}}"></image>
     </view>
     <view wx:if="{{lookIndex.awardId == 6 || lookIndex.awardId == 7 || lookIndex.awardId == 8 || lookIndex.awardId == 18}}">
       <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png'}}" style="width:750rpx;" mode="widthFix"></image>

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -838,13 +838,13 @@ Page({
         //   {
         //     awardDetailPicContentHeight: 0,
         //     awardName: "九阳破壁机", //奖品名称
-        //     awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+        //     awardPicurl: "https://xingb.venucia.com/award/24_1.png",//奖品小图
         //     couponCode: "我是卡号",//卡号
         //     couponSecret:"我是卡密",//卡密
         //     dead_date:"我是有效期",//有效期
         //     awardState: 1,
         //     cdate: "2020-03-23",
-        //     awardId: 15
+        //     awardId: 24
         //   }
         // ]
         // if(this.data.parames2.page<3){

496_dongfengqichen/pages/orderActivity/orderActivity.wxml

@@ -82,7 +82,7 @@
       <image class="closeTip" bindtap="tipShowControl" src="{{imgUrl+'/newImages4/15.png'}}"></image>
       <image class="tipGroupBg" src="{{imgUrl+'/newImages8/7.png'}}"></image>
       <view class="tipGroupContent">
-        <image class="tipGroupContentImg" src="{{imgUrl+'/newImages8/8.png?v=005'}}"></image>
+        <image class="tipGroupContentImg" src="{{imgUrl+'/newImages8/24.png'}}"></image>
         <!-- <image class="tipGroupContentBtn" bindtap="tipShowControl2" src="{{imgUrl+'/newImages4/14.png'}}"></image> -->
       </view>
     </view>

496_dongfengqichen/pages/orderActivity/orderActivity.wxss

@@ -244,7 +244,7 @@
 }
 .tipGroupContentImg{
   width: 601rpx;
-  height: 2061rpx;
+  height: 2172rpx;
   margin: 0 auto;
 }
 .tipGroupContentBtn{

496_dongfengqichen/pages/rotaryDraw/rotaryDraw.js

@@ -150,8 +150,6 @@ Page({
     }
   },
   startDraw(){//开始抽奖
-    // this.drawAniFun(3000,660);
-    // return;
     if(!app.globalData.luckyTokenList.length){
       wx.showToast({
         title: '抽奖次数不足',
@@ -175,20 +173,10 @@ Page({
     })
   },
   getLucky(){
-    // app.globalData.luckyTokenList.splice(0, 1);
-    // this.drawAniFun(5500, 660);
-    // setTimeout(() => {
-    //   btnOpen = false;
-    //   this.prizeControl2();
-    // }, 5500 + 400);
-    // return;
     app.wxRequest(app.globalData.urlRoot + "wxPay/v3/getLucky", {token:app.globalData.luckyTokenList[0].token}, res => {
       console.log(res);
       if (res.code == 200) {
         app.globalData.luckyTokenList.splice(0,1);
-        // res.data.lucky = true;
-        // res.data.awardData = {};
-        // res.data.awardData.awardId = 19
         if(res.data.lucky){
           let timeNum = 0;
           let timeRotate = 0;
@@ -196,11 +184,20 @@ Page({
             timeNum = 3500;
             timeRotate = 420;
           }else if(res.data.awardData.awardId==20){
-            timeNum = 4000;
-            timeRotate = 480;
+            timeNum = 3833;
+            timeRotate = 460;
+          }else if(res.data.awardData.awardId==21){
+            timeNum = 5500;
+            timeRotate = 660;
+          }else if(res.data.awardData.awardId==22){
+            timeNum = 4500;
+            timeRotate = 540;
           }else if(res.data.awardData.awardId==23){
-            timeNum = 5000;
-            timeRotate = 600;
+            timeNum = 4833;
+            timeRotate = 580;
+          }else if(res.data.awardData.awardId==24){
+            timeNum = 5166;
+            timeRotate = 620;
           }
           this.drawAniFun(timeNum,timeRotate);
           setTimeout(() => {
@@ -210,11 +207,11 @@ Page({
           }, timeNum+400);
         }else{
           //1 0.12
-          this.drawAniFun(5500,660);
+          this.drawAniFun(5833,700);
           setTimeout(() => {
             btnOpen = false;
             this.prizeControl2();
-          }, 5500+400);
+          }, 5833+400);
         }
         console.log(app.globalData.luckyTokenList);
       }else{

496_dongfengqichen/pages/rotaryDraw/rotaryDraw.wxml

@@ -1,11 +1,11 @@
 <!--pages/rotaryDraw/rotaryDraw.wxml-->
 <view class="all">
   <view class="main">
-    <image class="pageBg" src="{{imgUrl+'/newImages8/15.png'}}"></image>
+    <image class="pageBg" src="{{imgUrl+'/newImages8/27.png'}}"></image>
     <view class="gameFrame">
       <view class="gameGroup">
-        <image class="gameDial" animation="{{drawAni}}" src="{{imgUrl+'/newImages8/21.png'}}"></image>
-        <image class="gamePointer" bindtap="startDraw" src="{{imgUrl+'/newImages8/13.png'}}"></image>
+        <image class="gameDial" animation="{{drawAni}}" src="{{imgUrl+'/newImages8/26.png'}}"></image>
+        <image class="gamePointer" bindtap="startDraw" src="{{imgUrl+'/newImages8/25.png'}}"></image>
         <!-- <image class="gamePointer2" bindtap="startDraw" src="{{imgUrl+'/newImages8/13.png'}}"></image> -->
       </view>
     </view>

496_dongfengqichen/pages/star/star.wxml

@@ -2,7 +2,7 @@
 <view id="star" class="showView">
   <view class="home">
     <view class="bgGroup">
-      <image class="bg" src="{{imgUrl+'/newImages7/13.png?v=006'}}"></image>
+      <image class="bg" src="{{imgUrl+'/newImages8/28.png'}}"></image>
       <image class="selectImg1" wx:if="{{!selectGroup[0]}}" bindtap="cutSelect" data-type="0" src="{{imgUrl+'/newImages7/7.png'}}"></image>
       <image class="selectImg1_1" wx:if="{{selectGroup[0]}}" bindtap="cutSelect" data-type="0" src="{{imgUrl+'/newImages7/10.png?v=004'}}"></image>
       <image class="selectImg2" wx:if="{{!selectGroup[1]}}" bindtap="cutSelect" data-type="1" src="{{imgUrl+'/newImages7/8.png'}}"></image>

496_dongfengqichen/project.config.json

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,