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

496_dongfengqichen/app.js

@@ -111,7 +111,8 @@ App({
     addPageEnterState:{
       index:false,
       luckyStar:false,
-      star:false
+      star:false,
+      myCenter:false
     }
   },
   // 获取openId

496_dongfengqichen/pages/index/index.js

@@ -80,7 +80,7 @@ Page({
   },
   loadFun: function () {
     if (!app.globalData.addPageEnterState.index) {
-      app.addPageEnter(1);
+      app.addPageEnter("2AF7D5B88BBFF4159C8079E963E72C9B");
       app.globalData.addPageEnterState.index = true;
     }
     this.setData({

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.js

@@ -0,0 +1,38 @@
+// pages/lookPrizeDetail/lookPrizeDetail.js
+const app = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    lookIndex:{
+      type: Object,
+      value: {}
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    imgUrl: app.globalData.urlStatic,//图片路径
+    showType:1
+  },
+  //组件生命周期函数-在组件实例进入页面节点树时执行
+  attached(){
+    
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closeXieyi: function () {
+      this.triggerEvent('lookPrizeDetail')
+    },
+    showTypeControl: function (e) {
+      this.setData({
+        showType: e.currentTarget.dataset.type
+      })
+    },
+  }
+})

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.json

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

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxml

@@ -0,0 +1,21 @@
+<!--pages/lookPrizeDetail/lookPrizeDetail.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>
+    <view wx:if="{{lookIndex.awardId<6}}" style="position: relative;">
+      <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'.png'}}" style="width:750rpx;" mode="widthFix"></image>
+      <image class="confirm" bindtap="closeXieyi" src="{{imgUrl+'/newImages3/35.png'}}"></image>
+    </view>
+    <view>
+      <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png'}}" style="width:750rpx;" mode="widthFix"></image>
+      <view style="position: relative;">
+        <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_2_'+showType+'.png'}}" style="width:750rpx;" mode="widthFix"></image>
+        <view class="image6Btn1" wx:if="{{showType==2}}" bindtap="showTypeControl" data-type="1"></view>
+        <view class="image6Btn2" wx:if="{{showType==1}}" bindtap="showTypeControl" data-type="2"></view>
+      </view>
+      <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_3.png'}}" style="width:750rpx;" mode="widthFix"></image>
+    </view>
+  </view>
+</view>

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxss

@@ -0,0 +1,66 @@
+/* pages/lookPrizeDetail/lookPrizeDetail.wxss */
+.closeXieyi{
+  display: block;
+}
+.main{
+  width: 750rpx;
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: calc(100vh - 120rpx);
+  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;
+}
+.closeXieyi{
+  position: absolute;
+  right: 48rpx;
+  top: 38rpx;
+  width: 42rpx;
+  height: 42rpx;
+}
+.confirm{
+  position: absolute;
+  left: 50%;
+  bottom: 110rpx;
+  transform: translateX(-50%);
+  width: 275rpx;
+  height: 49rpx;
+}
+
+
+.image6Btn1,.image6Btn2{
+  position: absolute;
+  top:35rpx;
+  left: 70rpx;
+  opacity: 0;
+}
+.image6Btn1{
+  width: 310rpx;
+  height: 80rpx;
+  background-color: red;
+}
+.image6Btn2{
+  left: auto;
+  right: 70rpx;
+  width: 310rpx;
+  height: 80rpx;
+  background-color: green;
+}

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -75,7 +75,7 @@ Page({
   },
   loadFun: function () {
     if (!app.globalData.addPageEnterState.luckyStar) {
-      app.addPageEnter(2);
+      app.addPageEnter("FF975289E95B64D590C9A106B898574F");
       app.globalData.addPageEnterState.luckyStar = true;
     }
     if (app.globalData.userInfoData) {

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -59,142 +59,72 @@ Page({
     getState:true,
     scoutRule:false,
     vipDetailShow:false,
+    lookPrizeDetail:false,
+    lookIndex:null,
     testData:[
-      { 
-        awardDetailPicContentHeight:0,
-        awardName: "200元加油卡", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic +"/testImg/200元加油卡.png",//奖品详情
-        awardPicurl:"https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode:"3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 0,
-        awardName: "500元现金", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/500元现金.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 0,
-        awardName: "1000元现金", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/1000元现金.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 398,
-        awardName: "爱奇艺月卡", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/爱奇艺月卡.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 798,
-        awardName: "购车优惠券", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/购车优惠券.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 602,
-        awardName: "机油升级券", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/机油升级券.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 398,
-        awardName: "京东E卡", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/京东E卡.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 0,
-        awardName: "美的烤箱", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/美的烤箱.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
-        cdate: "2020-03-23",
-      },
+      // { 
+      //   awardDetailPicContentHeight:0,
+      //   awardName: "头等舱机票", //奖品名称
+      //   awardPicurl:"https://xingb.venucia.com/award/10_1.png",//奖品小图
+      //   productCode:"3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+      //   awardState: 0,
+      //   cdate: "2020-03-23",
+      //   awardId:1
+      // },
+      // {
+      //   awardDetailPicContentHeight: 0,
+      //   awardName: "小米扫地机器人", //奖品名称
+      //   awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+      //   productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+      //   awardState: 0,
+      //   cdate: "2020-03-23",
+      //   awardId: 2
+      // },
+      // {
+      //   awardDetailPicContentHeight: 0,
+      //   awardName: "索尼无线蓝牙耳机", //奖品名称
+      //   awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+      //   productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+      //   awardState: 0,
+      //   cdate: "2020-03-23",
+      //   awardId: 3
+      // },
+      // {
+      //   awardDetailPicContentHeight: 0,
+      //   awardName: "美的烤箱", //奖品名称
+      //   awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+      //   productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+      //   awardState: 0,
+      //   cdate: "2020-03-23",
+      //   awardId: 4
+      // },
+      // {
+      //   awardDetailPicContentHeight: 0,
+      //   awardName: "200元油卡", //奖品名称
+      //   awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
+      //   productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
+      //   awardState: 0,
+      //   cdate: "2020-03-23",
+      //   awardId: 5
+      // },
       {
         awardDetailPicContentHeight: 0,
-        awardName: "米家扫地机器人", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/米家扫地机器人.png",//奖品详情
+        awardName: "100元京东E卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
         productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
         awardState: 0,
         cdate: "2020-03-23",
+        awardId: 6
       },
       {
         awardDetailPicContentHeight: 0,
-        awardName: "启辰星定制旅行箱", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/启辰星定制旅行箱.png",//奖品详情
+        awardName: "50元京东E卡", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
         productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
         awardState: 0,
         cdate: "2020-03-23",
+        awardId: 7
       },
-      {
-        awardDetailPicContentHeight: 398,
-        awardName: "瑞幸咖啡免费券", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/瑞幸咖啡免费券.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 0,
-        awardName: "索尼无线蓝牙耳机", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/索尼无线蓝牙耳机.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 398,
-        awardName: "腾讯视频月卡", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/腾讯视频月卡.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 0,
-        awardName: "头等舱", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/头等舱.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
-        cdate: "2020-03-23",
-      },
-      {
-        awardDetailPicContentHeight: 398,
-        awardName: "网易云音乐月卡", //奖品名称
-        awardDetailPicurl: app.globalData.urlStatic + "/testImg/网易云音乐月卡.png",//奖品详情
-        awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
-        productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 1,
-        cdate: "2020-03-23",
-      }
     ]
   },
 
@@ -213,6 +143,10 @@ Page({
     }
   },
   loadFun: function () {
+    if (!app.globalData.addPageEnterState.myCenter) {
+      app.addPageEnter("BDAB6E93ECCD815EE83371E16EE42886");
+      app.globalData.addPageEnterState.myCenter = true;
+    }
     this.getUserInfo();
     this.getAddress();
     if (app.globalData.userMobile) {
@@ -607,23 +541,28 @@ Page({
     },this)
   },
   lookDesc:function(e){//查看奖品详情
-    if (this.data.descFrameShow){
-      this.setData({
-        descFrameShow: !this.data.descFrameShow,
-      })
-      return;
-    }
-    if (this.data.recordList[e.currentTarget.dataset.value].awardState == 0){
-      this.setData({
-        mycenterTipWindow:this.data.isAddress?2:1,
-        lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
-      })
-    } else {
-      this.setData({
-        descFrameShow: !this.data.descFrameShow,
-        lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
-      })
-    }
+    var index = e.currentTarget.dataset.index;
+    this.setData({
+      lookIndex: (index || index == 0) ? this.data.recordList[index]:null,
+      lookPrizeDetail: !this.data.lookPrizeDetail
+    })
+    // if (this.data.descFrameShow){
+    //   this.setData({
+    //     descFrameShow: !this.data.descFrameShow,
+    //   })
+    //   return;
+    // }
+    // if (this.data.recordList[e.currentTarget.dataset.value].awardState == 0){
+    //   this.setData({
+    //     mycenterTipWindow:this.data.isAddress?2:1,
+    //     lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
+    //   })
+    // } else {
+    //   this.setData({
+    //     descFrameShow: !this.data.descFrameShow,
+    //     lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
+    //   })
+    // }
   },
   lookRule: function (e) {//查看奖品详情
     this.setData({
@@ -689,7 +628,7 @@ Page({
         getState: false
       })
       if(res.code == 200){
-        // res.data = this.data.testData;
+        res.data = this.data.testData;
         this.setData({
           recordList:res.data
         })

496_dongfengqichen/pages/myCenter/myCenter.json

@@ -6,6 +6,7 @@
     "agreement": "../agreement/agreement",
     "userMsg": "/pages/userMsg/userMsg",
     "placingOrder": "/pages/placingOrder/placingOrder",
-    "scoutRule": "/pages/scoutRule/scoutRule"
+    "scoutRule": "/pages/scoutRule/scoutRule",
+    "lookPrizeDetail": "/pages/lookPrizeDetail/lookPrizeDetail"
   }
 }

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -121,16 +121,17 @@
         <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">
-            <view class="recordHeadGroup">
+            <!-- <view class="recordHeadGroup">
               <image class="recordUserImg" src="{{userData.avatarUrl?userData.avatarUrl:imgUrl+'/images/defaultHead.png'}}"></image>
-            </view>
+            </view> -->
+            <image class="awardPicurl" mode="aspectFit" src="{{item.awardPicurl}}"></image>
             <view class="recordMainGroup" style="width:230rpx;">
               <view class="rewardName">{{item.awardName}}</view>
               <view class="rewardTerm">{{item.cdate}}</view>
             </view>
           </view>
-          <view class="recordPic">
-            <!-- <view class="noLock" wx:if="{{item.awardState == 0}}">未激活</view> -->
+          <image class="lookDetail" bindtap="lookDesc" data-index="{{index}}" src="{{imgUrl+'/newImages3/34.png'}}"></image>
+          <!-- <view class="recordPic">
             <image class="recordTip" bindtap="lookDesc" data-value="{{index}}" src="{{imgUrl+'/images/recordTip.png'}}"></image> 
             <image wx:if="{{item.awardId!=1 && recordNow!=3}}" class="rewardIcon" mode="aspectFit" src="{{item.awardPicurl}}"></image>
             <image wx:if="{{item.awardId!=1 && recordNow==3}}" class="luckyClaw" mode="aspectFit" src="{{item.awardPicurl}}"></image>
@@ -141,7 +142,7 @@
               </view>
               <view class="rewardCashText">购车红包</view>
             </view>
-          </view>
+          </view> -->
         </view>
       </view>
     </view>
@@ -292,5 +293,6 @@
   <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>
   <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>
   <scoutRule  bindscoutRule="scoutRuleControl" wx:if="{{scoutRule}}"></scoutRule>
+  <lookPrizeDetail lookIndex="{{lookIndex}}"  bindlookPrizeDetail="lookDesc" wx:if="{{lookPrizeDetail}}"></lookPrizeDetail>
   <tabBar></tabBar>
 </view>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -261,7 +261,7 @@ view{
 }
 .recordGroup{
   margin: 0 auto;
-  padding: 20rpx 0;
+  padding: 15rpx 0;
   width: 606rpx;
   box-sizing: border-box;
   display: flex;
@@ -269,6 +269,9 @@ view{
   justify-content: space-between;
   border-bottom: 1rpx solid #D4D4D6;
 }
+.recordGroup:last-of-type{
+  border:none;
+}
 .recordGroupLeft{
   display: flex;
   align-items: center;
@@ -890,4 +893,13 @@ view{
   margin: 0 auto;
   margin-top: 25rpx;
   margin-bottom: 20rpx;
+}
+.awardPicurl{
+  width:133rpx;
+  height:84rpx;
+  margin-right: 40rpx;
+}
+.lookDetail{
+  width: 98rpx;
+  height: 39rpx;
 }

496_dongfengqichen/pages/placingOrder/placingOrder.js

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

496_dongfengqichen/pages/star/star.js

@@ -123,7 +123,7 @@ Page({
   },
   loadFun(){
     if (!app.globalData.addPageEnterState.star) {
-      app.addPageEnter(3);
+      app.addPageEnter("61D8FFCBF9D58A1DFB3F660294CE006A");
       app.globalData.addPageEnterState.star = true;
     }
     this.gettime();

496_dongfengqichen/pages/yuyue/yuyue.js

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