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

496_dongfengqichen/pages/coupon/coupon.js

    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    if (options.parentOpenid) {
-      this.data.parentOpenid = options.parentOpenid;
-      wx.setStorageSync("parentOpenid", options.parentOpenid);
-      app.globalData.parentOpenid = options.parentOpenid;
+    if (options.scene) {
+      this.data.parentOpenid = options.scene;
+      wx.setStorageSync("parentOpenid", options.scene);
+      app.globalData.parentOpenid = options.scene;
     }
     if (app.globalData.openid) {
       this.loadFun();

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxml

         <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 style="position: relative;">
+        <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_3.png'}}" style="width:750rpx;" mode="widthFix"></image>
+
+        <view class="exchangeCode">{{recordList[lookDescId].couponCode || recordList[lookDescId].productCode || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        </view>
+
+
+      </view>
     </view>
   </view>
 </view>

496_dongfengqichen/pages/poster/poster.js

     return {
       title: '您有一份启辰星专属礼品待领取',
       imageUrl: this.data.imgUrl + "/newImages3/28_" + (this.data.swiperCurrent+1)+".png?v=004",
-      path: "/pages/coupon/coupon?parentOpenid=" + app.globalData.openid
+      path: "/pages/coupon/coupon?scene=" + app.globalData.openid
     }
   },
   saveImg: function () {//保存到手机