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

496_dongfengqichen/app.json

@@ -21,7 +21,8 @@
     "pages/placingOrder/placingOrder",
     "pages/fragmentRule/fragmentRule",
     "pages/supplement/supplement",
-    "pages/prizeDetail/prizeDetail"
+    "pages/prizeDetail/prizeDetail",
+    "pages/scoutRule/scoutRule"
   ],
   "window": {
     "backgroundTextStyle": "light",

496_dongfengqichen/pages/component/service/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/component/service/index.wxml-->
 <view>
-  <image class="serviceIcon" style="height:82rpx;" bindtap="maskShow" src="{{imgUrl+'/newImages/38.png'}}"></image>
-  <image class="serviceIcon" bindtap="openYuyue" style="top:577rpx;" src="{{imgUrl+'/btns/appointmentIcon.png'}}"></image>
+  <image class="serviceIcon" bindtap="maskShow" src="{{imgUrl+'/newIcon/3.png'}}"></image>
+  <image class="serviceIcon" bindtap="openYuyue" style="top:577rpx;" src="{{imgUrl+'/newIcon/4.png'}}"></image>
   <view wx:if="{{maskState}}" class="maskGroup" catchtouchmove="ture">
     <view class="contentGroup">
       <image style="width:100%;height:100%;" src="{{imgUrl+'/images/serviceBg.png'}}"></image>

496_dongfengqichen/pages/everyday/everyday.wxml

@@ -1,7 +1,7 @@
 <!--pages/everyday/everyday.wxml-->
 <view id="everyday" class="showView">
   <image class="showImg" src="{{imgUrl+'/newImages/30.png'}}"></image>
-  <image class="ruleBtn" bindtap="ruleControl" data-state="{{true}}" src="{{imgUrl+'/images/everyDayRuleIcon.png'}}"></image>
+  <image class="ruleBtn" bindtap="ruleControl" data-state="{{true}}" src="{{imgUrl+'/newIcon/1.png'}}"></image>
   <view class="title">集碎片，攒红包</view>
   <view class="menuBox">
     <image class="menu" src="{{imgUrl+'/star/everyday/menu.png'}}"></image>

496_dongfengqichen/pages/fragmentRule/fragmentRule.wxml

@@ -2,7 +2,7 @@
 <view class="all">
   <view class="main">
     <view class="contentGroup">
-      <image class="newImages26" src="{{imgUrl+'/newImages/26.png'}}"></image>
+      <image class="newImages26" src="{{imgUrl+'/newImages/41.png'}}"></image>
       <image class="newImages27" bindtap="cutPage" src="{{imgUrl+'/newImages/27.png'}}"></image>
     </view>
   </view>

496_dongfengqichen/pages/fragmentRule/fragmentRule.wxss

@@ -12,11 +12,11 @@ view{
 .contentGroup{
   position: relative;
   width: 750rpx;
-  height: 1506rpx;
+  height: 2276rpx;
 }
 .newImages26{
   width: 750rpx;
-  height: 1506rpx;
+  height: 2276rpx;
 }
 .newImages27{
   position: absolute;

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -49,7 +49,8 @@ Page({
     gameEnd:true,
     ani:null,
     certificationInfo:false,//是否车主认证了
-    addressShow:false
+    addressShow:false,
+    isChanceShow:true,//是否还有机会
   },
 
   /**
@@ -174,9 +175,8 @@ Page({
           }
         }, 1000);
       }else{
-        wx.showToast({
-          title: res.msg,
-          icon:"none"
+        this.setData({
+          isChanceShow:false
         })
       }
     },this)
@@ -541,5 +541,10 @@ Page({
     this.setData({
       addressShow: !this.data.addressShow
     })
+  },
+  chanceShowControl:function(){
+    this.setData({
+      isChanceShow:true
+    })
   }
 })

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -52,13 +52,20 @@
     <image bindtap="cutPage" class="gameTip" src="{{imgUrl+'/images/luckyGetMoney.png'}}"></image>
     <view class="gameRuleDesc" wx:if="{{ruleShow}}">
       <view class="ruleGroup">
-        <image class="gameRuleIcon" src="{{imgUrl+'/images/gameRuleDesc.png'}}"></image>
+        <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="gameStrat" bindtap="closeRule"><image style="width:100%;height:100%;" src="{{imgUrl+'/btns/gameStart.png'}}"></image><button wx:if="{{!userData}}" style="min-height:0;width: 277rpx;height: 50rpx;" bindgetuserinfo="getUserWxMsg" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN"></button></view>
+        <view class="gameRuleGroup">
+          <view style="width: 460rpx;height: 839rpx;">
+            <image class="newImages48" style="width: 100%;height: 100%;" src="{{imgUrl+'/newImages/48.png'}}"></image>
+          </view>
+          <view class="gameStrat" bindtap="closeRule">
+            <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/gameStart.png'}}"></image>
+            <button wx:if="{{!userData}}" style="min-height:0;width: 277rpx;height: 50rpx;" bindgetuserinfo="getUserWxMsg" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN"></button>
+          </view>
+        </view>
       </view>
     </view>
-    <view class="gameRuleDesc" style="background-color:rgba(000,000,000,0)" wx:if="{{false}}">
-    </view>
+    <view class="gameRuleDesc" style="background-color:rgba(000,000,000,0)" wx:if="{{false}}"></view>
     <view class="successPop" wx:if="{{pizeTip}}">
       <view class="successGroup" wx:if="{{pizeTip==1}}">
         <image class="luckyPizeType" src="{{imgUrl+'/images/luckyPizeType1.png'}}"></image>
@@ -85,6 +92,13 @@
     <view class="downTimeGroup" wx:if="{{startDown!=-1}}">
       <image class="luckyNum" src="{{imgUrl+'/images/luckyNum'+startDown+'.png'}}"></image>
     </view>
+    <view class="downTimeGroup" wx:if="{{!isChanceShow}}">
+      <view class="chanceGroup">
+        <image class="newImages44" src="{{imgUrl+'/newImages/44.png'}}"></image>
+        <image class="newImages45" bindtap="chanceShowControl" src="{{imgUrl+'/newImages/45.png'}}"></image>
+        <image class="gameRuleClose" bindtap="chanceShowControl" src="{{imgUrl+'/star/closebtn.png'}}"></image>
+      </view>
+    </view>
   <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>
   </view>
   <tabBar></tabBar>

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -40,8 +40,8 @@ view{
 }
 .ruleGroup{
   position: relative;
-  width: 487rpx;
-  height: 459rpx;
+  width: 549rpx;
+  height: 736rpx;
 }
 .gameRuleIcon{
   width: 100%;
@@ -58,10 +58,7 @@ view{
 .gameStrat{
   width:277rpx;
   height:50rpx;
-  position: absolute;
-  bottom: 50rpx;
-  left: 50%;
-  transform: translateX(-50%);
+  padding-top: 37rpx;
 }
 .gameMain{
   position: relative;
@@ -433,4 +430,32 @@ view{
   top: 920rpx;
   width: 147rpx;
   height: 105rpx;
+}
+.chanceGroup{
+  position: relative;
+  width: 489rpx;
+  height: 460rpx;
+}
+.newImages44{
+  width: 100%;
+  height: 100%;
+}
+.newImages45{
+  position: absolute;
+  bottom: 58rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 278rpx;
+  height: 51rpx;
+}
+.gameRuleGroup{
+  position: absolute;
+  top: 115rpx;
+  left:0;
+  width: 100%;
+  height: 570rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  overflow: auto;
 }

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -56,7 +56,8 @@ Page({
     addressShow:false,
     mycenterTipWindow:0,
     barNums:0,
-    getState:true
+    getState:true,
+    scoutRule:false
   },
 
   /**
@@ -629,6 +630,11 @@ Page({
       placing: !this.data.placing
     })
   },
+  scoutRuleControl:function(){
+    this.setData({
+      scoutRule: !this.data.scoutRule
+    })
+  },
   tipWindow:function(){
     this.setData({
       mycenterTipWindow:0

496_dongfengqichen/pages/myCenter/myCenter.json

@@ -5,6 +5,7 @@
     "tabBar": "../component/tabBar/index",
     "agreement": "../agreement/agreement",
     "userMsg": "/pages/userMsg/userMsg",
-    "placingOrder": "/pages/placingOrder/placingOrder"
+    "placingOrder": "/pages/placingOrder/placingOrder",
+    "scoutRule": "/pages/scoutRule/scoutRule"
   }
 }

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -16,18 +16,18 @@
       </view>
       <view class="userNameGroup">
         <view class="userName">{{userData.nickName}}</view>
-        <image bindtap="addressControl" class="userNameEdit" src="{{imgUrl+'/images/userNameEdit.png'}}"></image>
+        <image bindtap="addressControl" class="userNameEdit" src="{{imgUrl+'/newImages/40.png'}}"></image>
       </view>
       <view class="userLevel" wx:if="{{userData.userLevel}}">
         <image class="userLevelIcon" src="{{imgUrl+'/images/userLevelIcon'+userData.userLevel+'.png'}}"></image>
         <image class="userLevelTip" src="{{imgUrl+'/images/myCenterTipLevel.jpg'}}"></image>
         <image class="userLevelText" src="{{imgUrl+'/images/userLevelText'+userData.userLevel+'.png'}}"></image>
-        <image class="lookRule" bindtap="lookRule" data-value="{{true}}" src="{{imgUrl+'/btns/myCenterRule.jpg'}}"></image>
+        <image class="lookRule" bindtap="scoutRuleControl" data-value="{{true}}" src="{{imgUrl+'/btns/myCenterRule.jpg'}}"></image>
       </view>
       <view class="userLevel" wx:if="{{!userData.userLevel}}">
         <image class="userWaitIcon" src="{{imgUrl+'/images/userWaitIcon.png'}}"></image>
         <view class="userWaitText">您的星探待激活</view>
-        <image class="lookRule" bindtap="lookRule" data-value="{{true}}" src="{{imgUrl+'/btns/myCenterRule.jpg'}}"></image>
+        <image class="lookRule" bindtap="scoutRuleControl" data-value="{{true}}" src="{{imgUrl+'/btns/myCenterRule.jpg'}}"></image>
       </view>
     </view>
     <view class="funList">
@@ -75,10 +75,10 @@
               <view class="taskLine" style="width:{{(item.unlockNum*25)+'%'}}"></view>
             </view>
             <view class="taskSignGroup">
-              <image class="taskSignIcon" src="{{imgUrl+'/images/taskSignIcon.png'}}"></image>
-              <image class="taskSignIcon" src="{{imgUrl+'/images/taskSignIcon.png'}}"></image>
-              <image class="taskSignIcon" src="{{imgUrl+'/images/taskSignIcon.png'}}"></image>
-              <image class="taskSignIcon" src="{{imgUrl+'/images/taskSignIcon.png'}}"></image>
+              <image class="taskSignIcon" src="{{imgUrl+'/newIcon/9.png'}}"></image>
+              <image class="taskSignIcon" src="{{imgUrl+'/newIcon/9.png'}}"></image>
+              <image class="taskSignIcon" src="{{imgUrl+'/newIcon/9.png'}}"></image>
+              <image class="taskSignIcon" src="{{imgUrl+'/newIcon/9.png'}}"></image>
             </view>
           </view>
           <view wx:if="{{item.unlockNum==4}}" class="taskSuccessBtn">已完成</view>
@@ -86,23 +86,23 @@
         </view>
       </view>
       <view class="taskDetailFrame" wx:if="{{taskNow==2}}">
-        <image class="scoutTaskDesc" src="{{imgUrl+'/newImages/scoutTaskDesc.png'}}"></image>
-        <image class="scoutTaskIcon" src="{{imgUrl+'/newImages/scoutTaskIcon'+(barNums>3?'2':barNums>0?'':'3')+'.png?v=002'}}"></image>
+        <image class="scoutTaskDesc" src="{{imgUrl+'/newIcon/5.png'}}"></image>
+        <image class="scoutTaskIcon" src="{{imgUrl+'/newIcon/'+(barNums>3?'12':barNums>0?'6':'11')+'.png?v=002'}}"></image>
         <view class="barFrame">
           <view style="position:absolute;top:-5rpx;left:295rpx;">
             <view class="barCarIcon">
-              <image class="scoutTaskCar" wx:for="{{0+barNums>5?5:0+barNums}}" wx:key="index" src="{{imgUrl+'/newImages/scoutTaskCarIcon2.png'}}"></image>
-              <image class="scoutTaskCar" wx:for="{{5-barNums>0?5-barNums:0}}" wx:key="index" src="{{imgUrl+'/newImages/scoutTaskCarIcon1.png'}}"></image>
+              <image class="scoutTaskCar" wx:for="{{0+barNums>5?5:0+barNums}}" wx:key="index" src="{{imgUrl+'/newIcon/8.png'}}"></image>
+              <image class="scoutTaskCar" wx:for="{{5-barNums>0?5-barNums:0}}" wx:key="index" src="{{imgUrl+'/newIcon/7.png'}}"></image>
             </view>
             <view class="barGroup">
               <view class="barContent" style="width:{{(barNums<=5?barNums:5)*20+'%'}}"></view>
             </view>
             <view class="barSignIcon">
-              <image class="taskSignIcon2" wx:for="{{5}}" wx:key="index" src="{{imgUrl+'/images/taskSignIcon.png'}}"></image>
+              <image class="taskSignIcon2" wx:for="{{5}}" wx:key="index" src="{{imgUrl+'/newIcon/9.png'}}"></image>
             </view>
           </view>
         </view>
-        <image class="scoutTaskGo" bindtap="starGo" src="{{imgUrl+'/newImages/scoutTaskGo.png'}}"></image>
+        <image class="scoutTaskGo" bindtap="starGo" src="{{imgUrl+'/newIcon/10.png'}}"></image>
       </view>
     </view>
     <view class="taskGroup" wx:if="{{selectNow==2}}">
@@ -112,11 +112,11 @@
         <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+'/newImages/1.png'}}"></image>
+        <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newIcon/16.png'}}"></image>
         <image class="newImages2" bindtap="enterLucky" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages/2.png'}}"></image>
-        <image class="newImages5" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages/5.png'}}"></image>
+        <image class="newImages5" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newIcon/15.png'}}"></image>
         <image class="newImages6" bindtap="enterEvery" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages/6.png'}}"></image>
-        <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages/8.png'}}"></image>
+        <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newIcon/13.png'}}"></image>
         <image class="newImages6" bindtap="starGo" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages/6.png'}}"></image>
         <view class="recordGroup" wx:if="{{recordList.length}}" wx:for="{{recordList}}" wx:key="index">
           <view class="recordGroupLeft">
@@ -145,9 +145,9 @@
       </view>
     </view>
     <view class="ranksGroup" wx:if="{{selectNow==3}}">
-      <image class="newImages3" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages/3.png'}}"></image>
-      <image class="newImages4" bindtap="starGo" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newImages/4.png'}}"></image>
-      <image class="newImages7" wx:if="{{shareFriendList.length}}" src="{{imgUrl+'/newImages/7.png'}}"></image>
+      <image class="newImages3" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newIcon/18.png'}}"></image>
+      <image class="newImages4" bindtap="starGo" wx:if="{{!shareFriendList.length}}" src="{{imgUrl+'/newIcon/17.png'}}"></image>
+      <image class="newImages7" wx:if="{{shareFriendList.length}}" src="{{imgUrl+'/newIcon/19.png'}}"></image>
       <scroll-view class="ranksList" wx:if="{{shareFriendList.length}}" scroll-y bindscrolltolower="scrolltolower">
         <view class="detachmentGroup" wx:for="{{shareFriendList}}" wx:key="index">
           <view class="detachmentGroupLeft">
@@ -209,7 +209,7 @@
         <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/myCenterBtn2.png'}}"></image></view>
     </view> -->
     <view class="orderDescGroup" wx:if="{{selectNow==4 && !buyState}}">
-      <image class="orderDesc" src="{{imgUrl+'/images/orderDesc.png'}}"></image>
+      <image class="orderDesc" src="{{imgUrl+'/newImages/43.png'}}"></image>
       <image class="indexOrderIcon" bindtap="placingControl" src="{{imgUrl+'/images/indexOrderIcon.png'}}"></image>
     </view>
     <view class="placingOrder" wx:if="{{selectNow==4 && buyState}}">
@@ -276,5 +276,6 @@
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>
   <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>
   <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
+  <scoutRule  bindscoutRule="scoutRuleControl" wx:if="{{scoutRule}}"></scoutRule>
   <tabBar></tabBar>
 </view>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -11,7 +11,7 @@ view{
   overflow: auto;
 }
 .msgGroup{
-  padding-top: 108rpx;
+  padding-top: 97rpx;
   margin-bottom: 111rpx;
 }
 .pageTitle{
@@ -24,8 +24,8 @@ view{
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 161rpx;
-  height: 161rpx;
+  width: 178rpx;
+  height: 178rpx;
   margin: 0 auto;
   margin-bottom: 27rpx;
   overflow: hidden;
@@ -63,7 +63,7 @@ view{
   position: relative;
   width:137rpx;
   height:137rpx;
-  border: 1rpx solid #7A797E;
+  border: 1rpx solid #355485;
   border-radius: 10rpx;
   display: flex;
   align-items: center;
@@ -330,7 +330,7 @@ view{
   border: 2rpx solid black;
 }
 .userMsg{
-  padding-top: 108rpx;
+  padding-top: 97rpx;
   position: relative;
 }
 .userNameGroup{
@@ -341,14 +341,15 @@ view{
   margin-bottom: 44rpx;
 }
 .userName{
-  font-weight: bold;
-  font-size: 30rpx;
-  color: black;
+  font-size:36rpx;
+  font-family:NissanBrand;
+  font-weight:bold;
+  color:rgba(30,27,28,1);
 }
 .userNameEdit{
-  width: 27rpx;
-  height: 27rpx;
-  margin-left: 10rpx;
+  width: 39rpx;
+  height: 40rpx;
+  margin-left: 12rpx;
 }
 .userMsgBg{
   position: absolute;
@@ -398,7 +399,7 @@ view{
 .arrowIcon{
   border-left: 10rpx solid transparent;
   border-right: 10rpx solid transparent;
-  border-top: 10rpx solid #0066F9;
+  border-top: 10rpx solid #355485;
   content: "";
   /* position: relative;     */
   width: 0;
@@ -473,7 +474,7 @@ view{
   padding-bottom: 64rpx;
 }
 .orderDesc{
-  width: 614rpx;
+  width: 627rpx;
   height: 842rpx;
   margin-bottom: 81rpx;
 }
@@ -765,7 +766,7 @@ view{
 }
 .scoutTaskCar{
   width: 51rpx;
-  height: 22rpx;
+  height: 21rpx;
 }
 .barSignIcon{
   position: absolute;

496_dongfengqichen/pages/placingOrder/placingOrder.js

@@ -103,8 +103,8 @@ Component({
           for(let i=0;i<res.data.list.length;i++){
             province.push(res.data.list[i].province);
           }
-          for (let j = 0; j < res.data.list[0].children.length; j++) {
-            city.push(res.data.list[0].children[j].city)
+          for (let j = 0; j < res.data.list[res.data.nearData.provinceIndex].children.length; j++) {
+            city.push(res.data.list[res.data.nearData.provinceIndex].children[j].city)
           }
           //将数据赋值给变量
           this.setData({

496_dongfengqichen/pages/scoutRule/scoutRule.js

@@ -0,0 +1,26 @@
+// pages/scoutRule/scoutRule.js
+const app = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    imgUrl: app.globalData.urlStatic,//图片路径
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closeXieyi: function () {
+      this.triggerEvent('scoutRule')
+    }
+  }
+})

496_dongfengqichen/pages/scoutRule/scoutRule.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

496_dongfengqichen/pages/scoutRule/scoutRule.wxml

@@ -0,0 +1,9 @@
+<!--pages/scoutRule/scoutRule.wxml-->
+<view class="all">
+  <view class="main">
+    <view class="titleText">预约试驾</view>
+    <view class="lineSty"></view>
+    <image class="closeXieyi" bindtap="closeXieyi" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
+    <image class="newImages46" src="{{imgUrl+'/newImages/46.png'}}"></image>
+  </view>
+</view>

496_dongfengqichen/pages/scoutRule/scoutRule.wxss

@@ -0,0 +1,41 @@
+/* pages/scoutRule/scoutRule.wxss */
+.main{
+  width: 750rpx;
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: calc(100vh - 150rpx);
+  overflow: auto;
+  background-color: white;
+  z-index: 99;
+}
+.titleText{
+  width: 682rpx;
+  margin: 0 auto;
+  margin-top: 78rpx;
+  margin-bottom: 28rpx;
+  line-height: 39rpx;
+  font-size:39rpx;
+  font-family:PingFangSC;
+  font-weight:bold;
+  color:rgba(0,77,149,1);
+}
+.lineSty{
+  width: 682rpx;
+  height:2rpx;
+  background-color: #B6B6B6;
+  margin: 0 auto;
+  margin-bottom: 59rpx;
+}
+.closeXieyi{
+  position: absolute;
+  right: 48rpx;
+  top: 38rpx;
+  width: 42rpx;
+  height: 42rpx;
+}
+.newImages46{
+  width: 750rpx;
+  height: 3578rpx;
+  margin-bottom: 77rpx;
+}

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+'/newImages/31.png'}}"></image>
+      <image class="bg" src="{{imgUrl+'/newImages/42.png'}}"></image>
       <image class="starBtn" bindtap="scout" src="{{imgUrl+'/newImages/32.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+'/newImages/25.png'}}"></image>
+    <image 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: 2814rpx;
+  height: 5377rpx;
 }
 
 .home>.logo1 {
@@ -170,9 +170,12 @@ view{
   top: 175rpx;
 }
 .starBtn{
+  position: absolute;
+  bottom: 219rpx;
+  left: 50%;
+  transform: translateX(-50%);
   width: 711rpx;
   height: 70rpx;
-  margin:60rpx auto; 
 }
 .starRuleTitle{
   width: 632rpx;
@@ -181,5 +184,5 @@ view{
 .bgGroup{
   position: relative;
   width: 750rpx;
-  height: 2814rpx;
+  height: 5377rpx;
 }

496_dongfengqichen/pages/supplement/supplement.js

@@ -146,8 +146,8 @@ Page({
         for (let i = 0; i < res.data.list.length; i++) {
           province.push(res.data.list[i].province);
         }
-        for (let j = 0; j < res.data.list[0].children.length; j++) {
-          city.push(res.data.list[0].children[j].city)
+        for (let j = 0; j < res.data.list[res.data.nearData.provinceIndex].children.length; j++) {
+          city.push(res.data.list[res.data.nearData.provinceIndex].children[j].city)
         }
         //将数据赋值给变量
         this.setData({

496_dongfengqichen/pages/yuyue/yuyue.wxml

@@ -37,6 +37,7 @@
           <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image>
         </view>
       </picker>
+      <image class="newImages50" src="{{imgUrl+'/newImages/50.png'}}"></image>
     <!-- </view> -->
     <view class="agreementGroup">
         <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png?v=003':'/images/disagreeIcon.png?v=002')}}"></image>

496_dongfengqichen/pages/yuyue/yuyue.wxss

@@ -59,7 +59,7 @@
   border-radius: 20rpx;
   box-sizing: border-box;
   line-height: 65rpx;
-  padding: 0 25rpx;
+  padding: 0 35rpx;
   font-size: 24rpx;
   margin-top: 18rpx;
   display: flex;
@@ -93,7 +93,7 @@
   border-radius: 20rpx;
   box-sizing: border-box;
   line-height: 65rpx;
-  padding: 0 25rpx;
+  padding: 0 35rpx;
   font-size: 24rpx;
   margin-top: 18rpx;
   display: flex;
@@ -142,4 +142,10 @@
   color:rgba(156,157,157,1);
   display: flex;
   align-items: center;
+}
+.newImages50{
+  width: 653rpx;
+  height: 66rpx;
+  margin: 0 auto;
+  margin-top: 18rpx;
 }

496_dongfengqichen/project.config.json

@@ -164,6 +164,12 @@
           "name": "认证",
           "pathName": "pages/scout/register/register",
           "query": ""
+        },
+        {
+          "id": -1,
+          "name": "星探规则",
+          "pathName": "pages/scoutRule/scoutRule",
+          "query": ""
         }
 			]
 		}