Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/app.js

@@ -1,6 +1,13 @@
 //app.js
 App({
-  onLaunch: function () {
+  onLaunch: function (options) {
+    console.log(options);
+    if (options.query && options.query.scene) {
+      var source = decodeURIComponent(options.query.scene).split("=");
+      this.globalData.sceneSource = source[1];
+    }else{
+      this.globalData.sceneSource = options.scene
+    }
     // 展示本地存储能力
     var openid = wx.getStorageSync('openid') || "";
     if (!openid) {
@@ -8,6 +15,7 @@ App({
       this.wxLogin();
     } else {
       this.globalData.openid = openid;
+      this.addAppEnter();
       this.getBuyState();
     } 
     var entered = wx.getStorageSync('entered');
@@ -18,9 +26,9 @@ App({
     if (userMobile){
       this.globalData.userMobile = userMobile;
     }
-    var friendOpenid = wx.getStorageSync('friendOpenid');
-    if (friendOpenid) {
-      this.globalData.friendOpenid = friendOpenid;
+    var scene = wx.getStorageSync('scene');
+    if (scene) {
+      this.globalData.scene = scene;
     }
     var certificationInfo = wx.getStorageSync('certificationInfo');
     if (certificationInfo) {
@@ -69,7 +77,7 @@ App({
     urlStatic: "https://www.jiyou-tech.com/2020/496_qichen/static",//测试静态资源根目录
     // urlStatic: "https://xingb.venucia.com/resource",//静态资源根目录
     openid: "",//OPENID
-    friendOpenid:"",//推荐人的openid
+    scene:"",//推荐人的openid
     session_key: "",//session_key
     openidSuccessFuc: null,//方法回调
     buyStateSuccessFuc:null,
@@ -90,7 +98,13 @@ App({
     getBuyState:null,
     entered:false,
     authenticationStatus:null,
-    skipType:null
+    skipType:null,
+    sceneSource:'',
+    addPageEnterState:{
+      index:false,
+      luckyStar:false,
+      star:false
+    }
   },
   // 获取openId
   getOpenid: function (code) {
@@ -115,6 +129,7 @@ App({
         if (!userInfoData) {
           this.getUserInfo();
         }
+        this.addAppEnter();
         this.getBuyState();
       } else {
         wx.showToast({
@@ -291,5 +306,15 @@ App({
         }
       }
     }, this);
+  },
+  addAppEnter: function () {//小程序整体pv统计
+    this.wxRequest(this.globalData.urlRoot + "statistics/addAppEnter", { scene:this.globalData.sceneSource}, res => {
+      console.log(res);
+    }, this,"POST");
+  },
+  addPageEnter: function (e) {//小程序页面pv统计
+    this.wxRequest(this.globalData.urlRoot + "statistics/addPageEnter", { scene: this.globalData.sceneSource, statisticsType:e }, res => {
+      console.log(res);
+    }, this, "POST");
   }
 })

496_dongfengqichen/pages/configure/configure.wxml

@@ -20,7 +20,7 @@
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==1}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="configure1" wx:if="{{paramesSwitchNum==1}}" src="{{imgUrl+'/configure/'+chooseType+'/1.jpg'}}"></image>
+    <image class="configure1" wx:if="{{paramesSwitchNum==1}}" src="{{imgUrl+'/configure/'+chooseType+'/1.jpg?v=002'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==2?'selectSty':''}}" bindtap="chooseType" data-type="2">
       <view class="paramesContent">
         <view>全新造型</view>
@@ -28,7 +28,7 @@
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==2}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="configure2" wx:if="{{paramesSwitchNum==2}}" src="{{imgUrl+'/configure/'+chooseType+'/2.jpg'}}"></image>
+    <image class="configure2" wx:if="{{paramesSwitchNum==2}}" src="{{imgUrl+'/configure/'+chooseType+'/2.jpg?v=002'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==3?'selectSty':''}}" bindtap="chooseType" data-type="3">
       <view class="paramesContent">
         <view>联盟技术</view>
@@ -36,7 +36,7 @@
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==3}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="configure3" wx:if="{{paramesSwitchNum==3}}" src="{{imgUrl+'/configure/'+chooseType+'/3.jpg'}}"></image>
+    <image class="configure3" wx:if="{{paramesSwitchNum==3}}" src="{{imgUrl+'/configure/'+chooseType+'/3.jpg?v=002'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==4?'selectSty':''}}" bindtap="chooseType" data-type="4">
       <view class="paramesContent">
         <view>智趣科技</view>
@@ -44,15 +44,15 @@
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==4}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="configure4" wx:if="{{paramesSwitchNum==4}}" src="{{imgUrl+'/configure/'+chooseType+'/4.jpg'}}"></image>
+    <image class="configure4" wx:if="{{paramesSwitchNum==4}}" src="{{imgUrl+'/configure/'+chooseType+'/4.jpg?v=002'}}"></image>
     <view class="paramesGroup {{paramesSwitchNum==5?'selectSty':''}}" bindtap="chooseType" data-type="5">
       <view class="paramesContent" style="border:none;">
-        <view>越级舒适</view>
+        <view>升级舒适</view>
         <image class="newImages2-84" wx:if="{{paramesSwitchNum!=5}}" src="{{imgUrl+'/newImages2/84.png'}}"></image>
         <image class="newImages2-86" wx:if="{{paramesSwitchNum==5}}" src="{{imgUrl+'/newImages2/86.png'}}"></image>
       </view>
     </view>
-    <image class="configure5" wx:if="{{paramesSwitchNum==5}}" src="{{imgUrl+'/configure/'+chooseType+'/5.jpg'}}"></image>
+    <image class="configure5" wx:if="{{paramesSwitchNum==5}}" src="{{imgUrl+'/configure/'+chooseType+'/5.jpg?v=002'}}"></image>
   </view>
   <image class="newImages2-90" src="{{imgUrl+'/newImages2/90.png'}}"></image>
   <image class="newImages2-85" bindtap="backPage" src="{{imgUrl+'/newImages2/85.png'}}"></image>

496_dongfengqichen/pages/coupon/coupon.js

@@ -7,7 +7,7 @@ Page({
    */
   data: {
     imgUrl: app.globalData.urlStatic,//图片路径
-    friendOpenid:null,//朋友的openid
+    scene:null,//朋友的openid
     countNum:0,
     pageShow: false,//是否显示页面  false
     isAppointmentShow: false,//是否显示预约弹框
@@ -30,7 +30,7 @@ Page({
       city:"",//城市
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
-      parentOpenid: app.globalData.friendOpenid,//好友openid
+      parentOpenid: app.globalData.scene,//好友openid
     },
     submitSuccess:false,
     placing:false
@@ -40,10 +40,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    if (options.friendOpenid) {
-      this.data.friendOpenid = options.friendOpenid;
-      wx.setStorageSync("friendOpenid", options.friendOpenid);
-      app.globalData.friendOpenid = options.friendOpenid;
+    if (options.scene) {
+      this.data.scene = options.scene;
+      wx.setStorageSync("scene", options.scene);
+      app.globalData.scene = options.scene;
     }
     if (app.globalData.openid) {
       this.loadFun();

496_dongfengqichen/pages/coupon/coupon.wxml

@@ -1,15 +1,18 @@
 <!--pages/coupon/coupon.wxml-->
 <view class="all" wx:if="{{pageShow}}">
   <view class="main">
-    <image class="couponBg" src="{{imgUrl+'/newImages2/37.png'}}"></image>
+    <image class="couponBg" src="{{imgUrl+'/newImages3/13.png'}}"></image>
     <view class="showWindow" bindtap="controlWindow"></view>
     <view class="btnGroup">
-      <image class="couponBtn" bindtap="showAppointment" src="{{imgUrl+'/newImages2/38.png'}}"></image>
+      <image class="couponBtn" bindtap="showAppointment" src="{{imgUrl+'/newImages3/12.png'}}"></image>
     </view>
   </view>
   <view class="maskWindow" wx:if="{{submitSuccess}}">
     <view class="newImagesGroup">
-      <image class="newImages14" src="{{imgUrl+'/newImages2/39.png'}}"></image>
+      <image class="newImages14" src="{{imgUrl+'/newImages3/14.png'}}"></image>
+      <view class="newImages15-group" style="height: 660rpx;">
+        <image class="newImages15" src="{{imgUrl+'/newImages3/15.png'}}"></image>
+      </view>
       <image class="newImages16" bindtap="controlWindow" src="{{imgUrl+'/newImages/16.png'}}"></image>
     </view>
   </view>

496_dongfengqichen/pages/coupon/coupon.wxss

@@ -192,13 +192,21 @@ view{
   width: 100%;
   height: 100%;
 }
-.newImages15{
+.newImages15-group{
   position: absolute;
-  bottom:62rpx;
-  left: 50%;
-  transform: translateX(-50%); 
-  width: 348rpx;
-  height: 65rpx;
+  top: 80rpx;
+  left: 0;
+  width: 100%;
+  height: auto;
+  display: flex;
+  justify-content: center;
+  overflow: auto;
+  padding-top: 77rpx;
+  box-sizing: border-box;
+}
+.newImages15{
+  width: 510rpx;
+  height: 732rpx;
 }
 .newImages16{
   position: absolute;

496_dongfengqichen/pages/index/index.js

@@ -21,7 +21,7 @@ Page({
       province:"",//省份
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
-      parentOpenid: app.globalData.friendOpenid,//好友openid
+      parentOpenid: app.globalData.scene,//好友openid
     },
     startAdvertisingUrl:'',//开屏广告路径
     isStartAdvertising: 1,//开屏广告透明度
@@ -61,7 +61,7 @@ Page({
     }
   },
   onLoad: function (options) {
-    if (app.globalData.isFirstLogin){
+    if (app.globalData.isFirstLogin) {
       console.log("第一次进入");
       wx.reportAnalytics('event_source_launch', {
         source: options.source ? options.source :0
@@ -79,6 +79,10 @@ Page({
     }
   },
   loadFun: function () {
+    if (!app.globalData.addPageEnterState.index) {
+      app.addPageEnter(1);
+      app.globalData.addPageEnterState.index = true;
+    }
     this.setData({
       kvurl: app.globalData.kvurl,
       kvurlH: app.globalData.kvurlH
@@ -121,7 +125,7 @@ Page({
     this.setData({
       siteSelect: false
     })
-    this.data.subscribeData.parentOpenid = app.globalData.friendOpenid;
+    this.data.subscribeData.parentOpenid = app.globalData.scene;
   },
   getBuyStates:function(){
     this.setData({

496_dongfengqichen/pages/index/index.wxml

@@ -2,10 +2,10 @@
 <view class="all" wx:if="{{mainShow}}">
   <view class="main" wx:if="{{isStartAdvertising==0 || !isStartAdvertisingShow}}">
     <view class="contentFrame">
-      <image class="newImages2-76" src="{{imgUrl+'/newImages2/112.png'}}"></image>
+      <image class="newImages2-76" src="{{imgUrl+'/newImages3/33.png'}}"></image>
       <view class="videoGroup" bindtap="playVideo">
-        <image class="newImages2-108" animation="{{playBtnDeg}}" src="{{imgUrl+'/newImages2/108.png?v=005'}}"></image>
-        <image class="newImages2-110" src="{{imgUrl+'/newImages2/110.png?v=004'}}"></image>
+        <image class="newImages2-108" animation="{{playBtnDeg}}" src="{{imgUrl+'/newImages3/32.png'}}"></image>
+        <image class="newImages2-110" src="{{imgUrl+'/newImages3/31.png'}}"></image>
         <video id="myVideo" class="myVideo" wx:if="{{videoShow}}" bindfullscreenchange="closeFull" src="{{videoList['videoUrl']}}"></video>
       </view>
       <image class="newImages2-11" wx:if="{{!buyState}}" bindtap="placingControl" src="{{imgUrl+'/newImages2/111.png'}}"></image>
@@ -25,7 +25,7 @@
       <view class="dotGroup1">
         <image class="{{swiperGroup.one.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.one.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.one.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText" src="{{imgUrl+'/newImages2/testImg/1/'+(swiperGroup.one.current+1)+'_2.png?v=003'}}"></image>
+      <image class="testText" src="{{imgUrl+'/newImages2/testImg/1/'+(swiperGroup.one.current+1)+'_2.png?v=004'}}"></image>
       <swiper class="swiper2" bindchange="swiperChange" data-num="2" current="{{swiperGroup.two.current}}">
         <swiper-item wx:for="{{swiperGroup.two.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/2/'+(index+1)+'_1.png'}}"></image>
@@ -40,7 +40,7 @@
       <view class="dotGroup2">
         <image class="{{swiperGroup.two.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.two.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.two.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText2" src="{{imgUrl+'/newImages2/testImg/2/'+(swiperGroup.two.current+1)+'_2.png?v=003'}}"></image>
+      <image class="testText2" src="{{imgUrl+'/newImages2/testImg/2/'+(swiperGroup.two.current+1)+'_2.png?v=004'}}"></image>
       <swiper class="swiper3" bindchange="swiperChange" data-num="3" current="{{swiperGroup.three.current}}">
         <swiper-item wx:for="{{swiperGroup.three.nums}}" wx:key="index">
           <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/3/'+(index+1)+'_1.png'}}"></image>
@@ -55,10 +55,10 @@
       <view class="dotGroup3">
         <image class="{{swiperGroup.three.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.three.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.three.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText3" src="{{imgUrl+'/newImages2/testImg/3/'+(swiperGroup.three.current+1)+'_2.png?v=002'}}"></image>
+      <image class="testText3" src="{{imgUrl+'/newImages2/testImg/3/'+(swiperGroup.three.current+1)+'_2.png?v=004'}}"></image>
       <swiper class="swiper4" bindchange="swiperChange" data-num="4" current="{{swiperGroup.four.current}}">
         <swiper-item wx:for="{{swiperGroup.four.nums}}" wx:key="index">
-          <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/4/'+(index+1)+'_1.png'}}"></image>
+          <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/testImg/4/'+(index+1)+'_1.png?v=003'}}"></image>
         </swiper-item>
       </swiper>
       <view class="arrow-left-4">
@@ -70,7 +70,7 @@
       <view class="dotGroup4">
         <image class="{{swiperGroup.four.current!=index?'newImages2-80':'newImages2-81'}}" wx:for="{{swiperGroup.four.nums}}" wx:key="index" src="{{imgUrl+'/newImages2/'+(swiperGroup.four.current!=index?'80':'81')+'.png'}}"></image>
       </view>
-      <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png?v=003'}}"></image>
+      <image class="testText4" src="{{imgUrl+'/newImages2/testImg/4/'+(swiperGroup.four.current+1)+'_2.png?v=004'}}"></image>
       <view class="lookMoreCar" style="padding-bottom:{{!buyState?190:60}}rpx;">
         <image class="newImages2-14" bindtap="lookMore" src="{{imgUrl+'/newImages2/100.png'}}"></image>
       </view>

496_dongfengqichen/pages/index/index.wxss

@@ -352,8 +352,8 @@ view{
   top: 5327rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 548rpx;
-  height: 139rpx;
+  width: 584rpx;
+  height: 104rpx;
 }
 .swiper2{
   position: absolute;
@@ -367,7 +367,7 @@ view{
   top: 6749rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 524rpx;
+  width: 598rpx;
   height: 103rpx;
 }
 .swiper3{
@@ -397,8 +397,8 @@ view{
   top: 9751rpx;
   left: 50%;
   transform: translateX(-50%);
-  width: 540rpx;
-  height: 104rpx;
+  width: 522rpx;
+  height: 103rpx;
 }
 .videoGroup{
   position: absolute;
@@ -411,12 +411,12 @@ view{
   align-items: center;
 }
 .newImages2-108{
-  width: 69rpx;
+  width: 72rpx;
   height: 72rpx;
 }
 .newImages2-110{
-  width: 17rpx;
-  height: 23rpx;
+  width: 21rpx;
+  height: 29rpx;
   margin-top: -42rpx;
 }
 .myVideo{

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -74,6 +74,10 @@ Page({
     }
   },
   loadFun: function () {
+    if (!app.globalData.addPageEnterState.luckyStar) {
+      app.addPageEnter(2);
+      app.globalData.addPageEnterState.luckyStar = true;
+    }
     if (app.globalData.userInfoData) {
       this.setData({
         userData: app.globalData.userInfoData

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -6,9 +6,9 @@
       <!-- <view class="gameTitle">幸运星抓手</view> -->
       <image class="gameTitle" src="{{imgUrl+'/newImages2/102.png'}}"></image>
       <view class="downTime">{{'00:'+downNum}}</view>
-      <image class="prizeIcon2" src="{{imgUrl+'/newImages2/105.png?v=003'}}"></image>
+      <image class="prizeIcon2" src="{{imgUrl+'/newImages3/26.png?v=007'}}"></image>
       <image class="gameClaw {{!gameEnd?'gameClaw2':''}}" style="top:{{clawTop}}rpx;left:{{clawLeft}}rpx;transform: scale({{clawScale}});" src="{{imgUrl+'/images/gameClaw'+(clawType?2:1)+'.png'}}"></image>
-      <image class="prizeIcon1" src="{{imgUrl+'/newImages2/104.png?v=003'}}"></image>
+      <image class="prizeIcon1" src="{{imgUrl+'/newImages3/25.png?v=007'}}"></image>
       <image class="newImages2-22" bindtap="gameStart" wx:if="{{!gameState}}" src="{{imgUrl+'/newImages2/22.png?v=003'}}"></image>
       <view class="getPrizeTip">
         <view class="prizeTipLine"></view>
@@ -22,7 +22,7 @@
         <view class="scrollMask"></view>
       </view>
       <view class="prizeLookGroup">
-        <image class="prizeLook" bindtap="prizeLook" src="{{imgUrl+'/btns/luckyPrize.png'}}"></image>
+        <image class="prizeLook" bindtap="prizeLook" src="{{imgUrl+'/newImages3/20.png'}}"></image>
       </view>
       <view class="gameControlFrame">
         <view class="gameControlGroup">
@@ -56,8 +56,8 @@
         <image class="gameRuleIcon" src="{{imgUrl+'/newImages/47.png'}}"></image>
         <image class="gameRuleClose" wx:if="{{ruleCloseShow}}" bindtap="closeRule" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <view class="gameRuleGroup">
-          <view style="width: 452rpx;height: 1542rpx;">
-            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages2/101.png'}}"></image>
+          <view style="width: 452rpx;height: 1661rpx;">
+            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages3/30.png'}}"></image>
           </view>
           <view class="gameStrat" bindtap="closeRule">
             <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/gameStart.png'}}"></image>
@@ -72,7 +72,7 @@
         <image class="luckyPizeType" src="{{imgUrl+'/images/luckyPizeType1.png'}}"></image>
         <image class="gameRuleClose" bindtap="closeWindow" style="top:-5rpx;right:-5rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
         <view class="prizeContent">
-          <image class="prizePic" src="{{endGameData.awardPicUrl}}" mode="aspectFit"></image>
+          <image class="prizePic" src="{{endGameData.awardPicurl}}" mode="aspectFit"></image>
           <view class="prizeName">{{endGameData.awardName}}</view>
           <image class="startRegister" style="margin:0;" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="addressControl" src="{{imgUrl+'/images/luckyPizeTip1.png'}}"></image>
         </view>

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -294,8 +294,8 @@ view{
   justify-content: center;
 }
 .prizeLook{
-  width:710rpx;
-  height:70rpx;
+  width:711rpx;
+  height:71rpx;
 }
 .shareBtn{
   position: absolute;

496_dongfengqichen/pages/mobileVerification/mobileVerification.wxml

@@ -2,7 +2,7 @@
 <view class="all" >
   <view class="main">
     <image class="bg" src="{{imgUrl+'/newImages2/92.png'}}"></image>
-    <image class="starRule" bindtap="showRule" src="{{imgUrl+'/newIcon/2.png'}}"></image>
+    <image class="starRule" wx:if="{{false}}" bindtap="showRule" src="{{imgUrl+'/newIcon/2.png'}}"></image>
     <view class="msgFrame">
       <view class="titleGroup">
         <image class="mobilepagelogo" src="{{imgUrl+'/images/mobilepagelogo.png'}}"></image>
@@ -26,9 +26,12 @@
       </view>
       <view class="agreementGroup">
         <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png':'/images/disagreeIcon.png')}}"></image>
-        <view class="agreementText"><view>我仔细阅读并接受所附的</view><view style="color:#355488;font-weight:bold;" bindtap="agreementControl">《用户协议与隐私政策》</view></view>
+        <view class="agreementText">
+          <image class="newImages3-4" src="{{imgUrl+'/newImages3/4.png'}}"></image>
+          <image class="newImages3-5" bindtap="agreementControl" style="margin-left:15rpx;" src="{{imgUrl+'/newImages3/5.png'}}"></image>
+        </view>
       </view>
-      <image class="submitBtn" bindtap="submitMobile" src="{{imgUrl+'/newImages2/93.png'}}"></image>
+      <image class="submitBtn" bindtap="submitMobile" src="{{imgUrl+'/newImages3/6.png'}}"></image>
     </view>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>

496_dongfengqichen/pages/mobileVerification/mobileVerification.wxss

@@ -98,7 +98,7 @@ view{
   color:rgba(255,255,255,1);
 }
 .submitBtn{
-  width:711rpx;
+  width:710rpx;
   height:70rpx;
 }
 .agreementGroup{
@@ -134,4 +134,12 @@ view{
   position: fixed;
   right: 29rpx;
   top: 175rpx;
+}
+.newImages3-4{
+  width: 262rpx;
+  height: 24rpx;
+}
+.newImages3-5{
+  width: 240rpx;
+  height: 24rpx;
 }

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -16,7 +16,7 @@ Page({
     siteSelect: false,//是否显示位置选择框
     isLogin:false,//登录状态
     selectNow:0,//现在的选项
-    taskNow:1,//现在的任务类型
+    taskNow:2,//现在的任务类型
     recordNow: 1,//现在的记录类型
     taskList: [],//任务列表
     shareFriendList:[],//星探小分队列表
@@ -35,7 +35,7 @@ Page({
       province: "",//省份
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
-      parentOpenid: app.globalData.friendOpenid,//好友openid
+      parentOpenid: app.globalData.scene,//好友openid
     },
     userData:{
       avatarUrl: null,
@@ -263,7 +263,7 @@ Page({
     } else {
       app.globalData.buyStateSuccessFuc = this.getBuyStates;
     }
-    this.data.subscribeData.parentOpenid = app.globalData.friendOpenid;
+    this.data.subscribeData.parentOpenid = app.globalData.scene;
   },
   getBuyStates: function () {
     this.setData({

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -35,7 +35,7 @@
       <view bindtap="selectChange" data-value="1" class="selectGroup" style="border-color:{{selectNow==1?'#667ea3':'#7A797E'}}">
         <view wx:if="{{selectNow==1}}" class="arrowIcon"></view>
         <view class="imgFrame">
-          <image class="taskIcon" src="{{imgUrl+'/newImages2/55_'+(selectNow==1?2:1)+'.png'}}"></image>
+          <image class="taskIcon" src="{{imgUrl+'/newImages3/23_'+(selectNow==1?2:1)+'.png?v=002'}}"></image>
         </view>
         <view class="selectText" style="color:{{selectNow==1?'#667ea3':'black'}}">我的任务</view>
       </view>
@@ -63,9 +63,9 @@
     </view>
     <image wx:if="{{selectNow<1 || selectNow>4}}" class="myCenterBotBg" src="{{imgUrl+'/images/myCenterBotBg.png'}}"></image>
     <view class="taskGroup" wx:if="{{selectNow==1}}">
-      <view class="taskSelect">
-        <view bindtap="selectTask" data-type='1' class="taskText {{taskNow==1?'taskText2':''}}">每日任务</view>
-        <view bindtap="selectTask" data-type='2' class="taskText {{taskNow==2?'taskText2':''}}">星探任务</view>
+      <view class="taskSelect" style="justify-content:center;">
+        <!-- <view bindtap="selectTask" data-type='1' class="taskText {{taskNow==1?'taskText2':''}}">每日任务</view> -->
+        <!-- <view bindtap="selectTask" data-type='2' class="taskText {{taskNow==2?'taskText2':''}}">星探任务</view> -->
       </view>
       <image class="newImages2-59" wx:if="{{taskNow==1}}" src="{{imgUrl+'/newImages2/75.png?v=001'}}"></image>
       <view class="taskDetailFrame" wx:if="{{taskNow==1}}">
@@ -86,7 +86,7 @@
           <view wx:if="{{item.unlockNum!=4}}" class="taskWaitBtn">未完成</view>
         </view>
       </view>
-      <view class="taskDetailFrame" style="top: 104rpx;height:485rpx;" wx:if="{{taskNow==2}}">
+      <view class="taskDetailFrame" style="top: 100rpx;height:485rpx;" wx:if="{{taskNow==2}}">
         <image class="scoutTaskDesc" src="{{imgUrl+'/newImages2/61.png'}}"></image>
         <image class="scoutTaskIcon" src="{{imgUrl+'/newIcon/'+(barNums>3?'12':barNums>0?'6':'11')+'.png?v=002'}}"></image>
         <view class="barFrame">
@@ -103,21 +103,21 @@
             </view>
           </view>
         </view>
-        <image class="scoutTaskGo" bindtap="starGo" src="{{imgUrl+'/newImages2/62.png'}}"></image>
+        <image class="scoutTaskGo" bindtap="starGo" src="{{imgUrl+'/newImages3/27.png'}}"></image>
       </view>
     </view>
     <view class="taskGroup" wx:if="{{selectNow==2}}">
       <view class="taskSelect">
         <view bindtap="selectRecord" data-type='1' class="taskText recordText {{recordNow==1?'taskText2':''}}">玩出惊喜奖品</view>
-        <view bindtap="selectRecord" data-type='2' class="taskText recordText {{recordNow==2?'taskText2':''}}">每日任务奖品</view>
+        <!-- <view bindtap="selectRecord" data-type='2' class="taskText recordText {{recordNow==2?'taskText2':''}}">每日任务奖品</view> -->
         <view bindtap="selectRecord" data-type='3' class="taskText recordText {{recordNow==3?'taskText2':''}}">星探奖励</view>
       </view>
       <view class="recordFrame">
-        <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages2/63.png'}}"></image>
+        <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages3/16.png'}}"></image>
         <image class="newImages2-64" bindtap="enterLucky" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
         <image class="newImages5" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages2/65.png'}}"></image>
         <image class="newImages6" bindtap="enterEvery" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
-        <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages2/66.png'}}"></image>
+        <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages3/19.png'}}"></image>
         <image class="newImages6" bindtap="starGo" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
         <view class="recordGroup" wx:if="{{recordList.length}}" wx:for="{{recordList}}" wx:key="index">
           <view class="recordGroupLeft">
@@ -146,8 +146,8 @@
       </view>
     </view>
     <view class="ranksGroup" wx:if="{{selectNow==3}}">
-      <image class="newImages3" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages2/69.png'}}"></image>
-      <image class="newImages4" bindtap="starGo" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages2/70.png'}}"></image>
+      <image class="newImages3" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages3/18.png'}}"></image>
+      <image class="newImages4" bindtap="starGo" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages3/17.png'}}"></image>
       <image class="newImages7" wx:if="{{shareFriendList.length}}" src="{{imgUrl+'/newImages2/71.png'}}"></image>
       <scroll-view class="ranksList" wx:if="{{shareFriendList.length}}" scroll-y bindscrolltolower="scrolltolower">
         <view class="detachmentGroup" wx:for="{{shareFriendList}}" wx:key="index">

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -798,13 +798,13 @@ view{
 }
 .scoutTaskGo{
   width: 256rpx;
-  height: 52rpx;
+  height: 51rpx;
   margin: 0 auto;
-  margin-top: 60rpx;
+  margin-top: 112rpx;
 }
 .newImages1{
-  width: 169rpx;
-  height: 180rpx;
+  width: 195rpx;
+  height: 182rpx;
   margin: 0 auto;
   margin-top: 30rpx;
   margin-bottom: 17rpx;
@@ -822,7 +822,7 @@ view{
 }
 .newImages3{
   width: 567rpx;
-  height:247rpx;
+  height:268rpx;
   margin: 0 auto;
   margin-bottom: 46rpx;
   margin-top: 22rpx;
@@ -851,8 +851,8 @@ view{
   margin-top: 22rpx;
 }
 .newImages8{
-  width: 192rpx;
-  height:165rpx;
+  width: 226rpx;
+  height:161rpx;
   margin: 0 auto;
   margin-top: 30rpx;
   margin-bottom: 21rpx;

496_dongfengqichen/pages/placingOrder/placingOrder.js

@@ -35,7 +35,7 @@ Component({
       city:"",//市区
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
-      parentOpenid: app.globalData.friendOpenid,//好友openid
+      parentOpenid: app.globalData.scene,//好友openid
     },
     getBuyState: false,
     mobileType: 2

496_dongfengqichen/pages/placingOrder/placingOrder.wxml

@@ -73,7 +73,7 @@
     <view class="receiveGroup">
       <image class="newImages12" bindtap="closePage" src="{{imgUrl+'/newImages/12.png'}}"></image>
       <image class="newImages2-1" src="{{imgUrl+'/newImages2/1.png'}}"></image>
-      <image class="newImages2-2" bindtap="enterMycenter" src="{{imgUrl+'/newImages2/2.png'}}"></image>
+      <image class="newImages2-2" bindtap="enterMycenter" src="{{imgUrl+'/newImages3/3.png'}}"></image>
       <image class="newImages2-3" bindtap="enterMycenter" src="{{imgUrl+'/newImages2/3.png'}}"></image>
     </view>
   </view>

496_dongfengqichen/pages/poster/poster.js

@@ -50,7 +50,7 @@ Page({
         this.data.windowH = option.windowHeight;
         for (let i = 0; i < 3; i++) {
           wx.getImageInfo({//缓存海报背景
-            src: this.data.imgUrl + '/images/tempImg'+(i+1)+'.jpg?v=007',
+            src: this.data.imgUrl + '/newImages3/tempImg'+(i+1)+'.jpg?v=007',
             success: res => {
               this.data.posterBg[i] = res.path;
             }
@@ -134,8 +134,8 @@ Page({
   onShareAppMessage: function () {
     return {
       title: '您有一份启辰星专属礼品待领取',
-      imageUrl: this.data.imgUrl + "/images/posterShareImg" + (this.data.swiperCurrent+1)+".jpg?v=004",
-      path: "/pages/coupon/coupon?friendOpenid=" + app.globalData.openid
+      imageUrl: this.data.imgUrl + "/newImages3/28_" + (this.data.swiperCurrent+1)+".png?v=004",
+      path: "/pages/coupon/coupon?scene=" + app.globalData.openid
     }
   },
   saveImg: function () {//保存到手机

496_dongfengqichen/pages/poster/poster.wxml

@@ -18,7 +18,7 @@
           <swiper-item wx:for="{{3}}" wx:key="index">
             <view class="selectTempFrame {{index==swiperCurrent?'selectTempFrameBorder':''}}">
               <view class="imgGroup">
-                <image style="width:100%;height:100%;" src="{{imgUrl+'/images/tempImg'+(index+1)+'.jpg?v=005'}}"></image>
+                <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages3/tempImg'+(index+1)+'.jpg'}}"></image>
                 <view class="userMsg">
                   <image class="userHead" src="{{userHead}}"></image>
                   <!-- <image class="userHead" src="{{imgUrl+'/images/posterChoose.png'}}"></image> -->
@@ -44,25 +44,33 @@
         <image class="rightArrow" wx:if="{{swiperCurrent!=2}}" bindtap="nextImg" src="{{imgUrl+'/newImages2/20.png'}}"></image>
       </view>
       <view class="operationFrame" style="background-image: url({{imgUrl+'/newImages2/17.png'}});">
-        <view class="operationGroup" bindtap="saveImg">
+        <view class="newImages3-share" bindtap="saveImg">
+          <image class="newImages3-8" src="{{imgUrl+'/newImages3/8.png'}}"></image>
+          <image class="newImages3-9" src="{{imgUrl+'/newImages3/9.png'}}"></image>
+        </view>
+        <!-- <view class="operationGroup" bindtap="saveImg">
           <image class="saveIcon" src="{{imgUrl+'/newImages2/18.png'}}"></image>
         </view>
         <view class="operationGroup">
           <image class="saveIcon" src="{{imgUrl+'/newImages2/19.png'}}"></image>
           <button class="shareBtn" style="min-height:0;width:100%;" open-type="share"></button>
-        </view>
+        </view> -->
       </view>
     </view>
     <view wx:if="{{selectType==2}}">
       <view class="shareGroup">
        <image class="newImages19" src="{{imgUrl+'/newImages/19.png'}}"></image>
-       <image class="posterShareImg" src="{{imgUrl+'/images/posterShareImg' + (swiperCurrent+1)+'.jpg?v=004'}}"></image>
+       <image class="posterShareImg" src="{{imgUrl+'/newImages3/28_' + (swiperCurrent+1)+'.png'}}"></image>
       </view>
-      <image class="newImages20" src="{{imgUrl+'/newImages/20.png'}}"></image>
-      <view class="shareSelect">
+      <view class="newImages20">
+        <image class="newImages3-10" src="{{imgUrl+'/newImages3/10.png'}}"></image>
+        <image class="newImages3-11" src="{{imgUrl+'/newImages3/11.png'}}"></image>
+        <button class="shareBtn2" style="min-height:0;width: 173rpx;height: 186rpx;" open-type="share"></button>
+      </view>
+      <!-- <view class="shareSelect">
         <image class="newImages21" src="{{imgUrl+'/newImages/21.png'}}"></image>
         <button class="shareBtn2" style="min-height:0;width: 96rpx;height: 100rpx;" open-type="share"></button>
-      </view>
+      </view> -->
     </view>
   </view>
   <tabBar></tabBar>

496_dongfengqichen/pages/poster/poster.wxss

@@ -14,10 +14,9 @@ view{
   width: 750rpx;
   height: 386rpx;
   display: flex;
-  justify-content:space-between;
+  justify-content:center;
   box-sizing: border-box;
-  padding: 0 112rpx;
-  padding-top: 102rpx;
+  padding-top: 62rpx;
 }
 .operationGroup{
   width: 237rpx;
@@ -269,10 +268,25 @@ view{
   height: 336rpx;
 }
 .newImages20{
-  width: 687rpx;
-  height: 83rpx;
-  margin: 0 auto;
-  margin-top: 42rpx;
+  position: relative;
+  width: 750rpx;
+  height: 482rpx;
+  margin-top: 40rpx;
+}
+.newImages3-10{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.newImages3-11{
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 155rpx;
+  width: 173rpx;
+  height: 186rpx;
 }
 .shareSelect{
   width: 96rpx;
@@ -291,10 +305,26 @@ view{
 }
 .shareBtn2{
   position: absolute;
-  left: 0;
-  top: 42%;
-  transform: translateY(-50%);
+  left: 50%;
+  transform: translateX(-50%);
+  top: 155rpx;
+  width: 173rpx;
+  height: 186rpx;
   margin: 0;
   padding: 0;
   opacity: 0;
+}
+.newImages3-8{
+  width: 96rpx;
+  height: 96rpx;
+}
+.newImages3-share{
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+.newImages3-9{
+  width: 260rpx;
+  height: 56rpx;
+  margin-top: 33rpx;
 }

496_dongfengqichen/pages/receiveRegister/receiveRegister.js

@@ -24,7 +24,7 @@ Page({
       province: "",//省份
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
-      parentOpenid: app.globalData.friendOpenid,//好友openid
+      parentOpenid: app.globalData.scene,//好友openid
     },
   },
 

496_dongfengqichen/pages/scout/register/register.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "认证中心",
   "usingComponents": {
-    "tabBar": "../component/tabBar/index"
+    "tabBar": "/pages/component/tabBar/index"
   }
 }

496_dongfengqichen/pages/scout/scout.wxml

@@ -4,7 +4,7 @@
     <image class="bg" src="{{imgUrl+'/newImages/scoutbg.jpg?v=004'}}"></image>
     <image class="reward" wx:if="{{maskid<4}}" src="{{imgUrl+'/newImages2/6.png?v=003'}}"></image>
     <image class="reward" wx:if="{{maskid>3}}" src="{{imgUrl+'/newImages2/7.png?v=002'}}"></image>
-    <image class="scoutbtn1" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image>
+    <image class="scoutbtn1" bindtap="getPoster" src="{{imgUrl+'/newImages3/7.png'}}"></image>
     <!-- <image class="scoutbtn1" wx:if="{{maskid>3}}" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image> -->
     <!-- <image class="scoutbtn1" wx:if="{{maskid<4}}" bindtap="getPoster" src="{{imgUrl+'/newImages2/8.png'}}"></image> -->
     <button class="btn2" wx:if="{{iconShow}}" open-type="getUserInfo" bindgetuserinfo="getUserWxMsg"></button>

496_dongfengqichen/pages/scoutRule/scoutRule.wxml

@@ -5,7 +5,7 @@
     <view class="lineSty"></view>
     <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
     <view style="position: relative;">
-      <image class="newImages46" src="{{imgUrl+'/newImages2/77.png'}}"></image>
+      <image class="newImages46" src="{{imgUrl+'/newImages3/2.png?v=006'}}"></image>
       <image class="newImages2-4" bindtap="cutPage" src="{{imgUrl+'/newImages2/4.png'}}"></image>
     </view>
   </view>

496_dongfengqichen/pages/scoutRule/scoutRule.wxss

@@ -36,7 +36,7 @@
 }
 .newImages46{
   width: 750rpx;
-  height: 5628rpx;
+  height: 5500rpx;
 }
 .newImages2-4{
   position: absolute;

496_dongfengqichen/pages/star/star.js

@@ -116,11 +116,18 @@ Page({
       starNumber:4000
     })
     if (app.globalData.openid) {
-      this.gettime();
+      this.loadFun();
     } else {
-      app.globalData.openidSuccessFuc = this.gettime;
+      app.globalData.openidSuccessFuc = this.loadFun;
     }
   },
+  loadFun(){
+    if (!app.globalData.addPageEnterState.star) {
+      app.addPageEnter(3);
+      app.globalData.addPageEnterState.star = true;
+    }
+    this.gettime();
+  },
   gettime(){
     app.wxRequest(app.globalData.urlRoot + "userInfo/getCertificationCount", {}, res => {
       console.log(res)

496_dongfengqichen/pages/star/star.wxml

@@ -2,12 +2,12 @@
 <view id="star" class="showView">
   <view class="home">
     <view class="bgGroup">
-      <image class="bg" src="{{imgUrl+'/newImages2/76.png'}}"></image>
+      <image class="bg" src="{{imgUrl+'/newImages3/1.png?v=004'}}"></image>
       <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages2/4.png'}}"></image>
     </view>
     <image class="logo1" src="{{imgUrl+'/star/logo1.png'}}"></image>
     <!-- <image class="logo2" src="{{imgUrl+'/star/logo2.png'}}"></image> -->
-    <image class="starRule" bindtap="showRule" src="{{imgUrl+'/newIcon/2.png'}}"></image>
+    <image wx:if="{{false}}" class="starRule" bindtap="showRule" src="{{imgUrl+'/newIcon/2.png'}}"></image>
     <!-- <view class="ruleBtn" wx:if="{{!maskShow}}" bindtap="showRule">规则说明</view> -->
     <!-- <view class="ruleBtn ruleBtnColor" wx:if="{{maskShow}}" bindtap="showRule">规则说明</view> -->
     <view class="propagandaBox">

496_dongfengqichen/pages/star/star.wxss

@@ -10,7 +10,7 @@ view{
 
 .bg {
   width: 750rpx;
-  height: 7008rpx;
+  height: 6833rpx;
 }
 
 .home>.logo1 {
@@ -184,7 +184,7 @@ view{
 .bgGroup{
   position: relative;
   width: 750rpx;
-  height: 7008rpx;
+  height: 6833rpx;
 }
 .newImages2-4{
   position: absolute;

496_dongfengqichen/pages/yuyue/yuyue.js

@@ -35,7 +35,7 @@ Component({
       city:"",//城市
       agent_code: "",//经销商编码
       agentDetail: "",//经销商详细信息
-      parentOpenid: app.globalData.friendOpenid,//好友openid
+      parentOpenid: app.globalData.scene,//好友openid
     },
     mobileType:2
   },

496_dongfengqichen/pages/yuyue/yuyue.wxml

@@ -1,7 +1,7 @@
 <!--pages/yuyue/yuyue.wxml-->
 <view class="all">
   <view class="main">
-    <view class="titleText">预约试驾</view>
+    <view class="titleText">预约鉴赏</view>
     <view class="lineSty"></view>
     <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
     <image class="yuyueTop" src="{{imgUrl+'/newImages2/40.png'}}"></image>
@@ -45,17 +45,17 @@
         <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png?v=003':'/images/disagreeIcon.png?v=002')}}"></image>
         <view class="agreementText">
           <image style="width:261rpx;height:23rpx;" src="{{imgUrl+'/images/myCenterAgreenTip.png'}}"></image>
-          <view bindtap="agreementControl">
+          <view bindtap="agreementControl" style="margin-left:15rpx;">
             <image style="width:240rpx;height:23rpx;margin-left:3rpx;" src="{{imgUrl+'/images/myCenterAgreen.png'}}"></image>
           </view>
         </view>
       </view>
       <view class="subscribeBtn" bindtap="subscribeFun" style="margin-top:34rpx;">
-        <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages2/43.png'}}"></image>
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages3/21.png'}}"></image>
         <button wx:if="{{userData}}" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="getUserWxMsg" style="width:100%;height:100%;min-height:0;padding:0;margin:0;"></button>
       </view>
       <view class="subscribeBtn" bindtap="lookMore">
-        <image style="width:100%;height:100%;" src="{{imgUrl+'/newIcon/21.png'}}"></image>
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages3/22.png'}}"></image>
       </view>
   </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>

496_dongfengqichen/pages/yuyue/yuyue.wxss

@@ -108,7 +108,7 @@
 .subscribeBtn{
   position: relative;
   margin: 0 auto;
-  width:652rpx;
+  width:651rpx;
   height:70rpx;
   margin-top: 18rpx;
   margin-bottom: 17rpx;

496_dongfengqichen/project.config.json

@@ -171,12 +171,12 @@
 					"pathName": "pages/scoutRule/scoutRule",
 					"query": ""
 				},
-        {
-          "id": -1,
-          "name": "查看完整配置",
-          "pathName": "pages/configure/configure",
-          "query": ""
-        }
+				{
+					"id": -1,
+					"name": "查看完整配置",
+					"pathName": "pages/configure/configure",
+					"query": ""
+				}
 			]
 		}
 	}