上市价格修改

496_dongfengqichen/pages/index/index.wxml

@@ -4,7 +4,7 @@
     <view class="contentFrame">
       <view class="newImages2-76">
         <!-- <image style="width:750rpx;height:10368rpx;" src="{{imgUrl+'/newImages4/16.png'}}"></image> -->
-        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_01.png'}}"></image>
+        <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_01.png?v=002'}}"></image>
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_02.png?v=002'}}"></image>
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_03.png'}}"></image>
         <image style="width:750rpx;height:1600rpx;" src="{{imgUrl+'/newImages6/images/newImg_04.png'}}"></image>

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -32,6 +32,7 @@ Page({
     getFriendListState:false,
     couponListState:false,
     couponListCode:"",
+    tipWindow2:false,
     subscribeData: {
       realname: "",//姓名
       mobile: "",//手机号
@@ -937,6 +938,11 @@ Page({
         buyStateTime: app.globalData.getBuyState.cdate
       })
     }
+    if(this.data.tipWindow2){
+      this.setData({
+        tipWindow2:false
+      })
+    }
     this.setData({
       placing: !this.data.placing
     })
@@ -1040,16 +1046,25 @@ Page({
     this.contentCopy(this.data.couponListCode);
   },
   lookOrder:function(){//跳转到智趣启辰小程序的订单页面
-    console.log("小程序跳转");
-    wx.navigateToMiniProgram({
-      appId:'wx1d585c8c2fffe589',
-      path:"/pages/carorder_info/carorder_info",
-      success(res) {
-        // 打开成功
-      },
-      complete(res){
-        console.log(res);
-      }
+    if(this.data.buyState){
+      console.log("小程序跳转");
+      wx.navigateToMiniProgram({
+        appId:'wx1d585c8c2fffe589',
+        path:"/pages/carorder_info/carorder_info",
+        success(res) {
+          // 打开成功
+        },
+        complete(res){
+          console.log(res);
+        }
+      })
+    }else{
+      this.tipWindowControl();
+    }
+  },
+  tipWindowControl:function(){
+    this.setData({
+      tipWindow2:!this.data.tipWindow2
     })
   }
 })

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -63,7 +63,7 @@
     </view>
     <view class="myCenterBotBgGroup" wx:if="{{selectNow<1 || selectNow>4}}">
       <image class="myCenterBotBg" src="{{imgUrl+'/images/myCenterBotBg.png'}}"></image>
-      <image class="myCenterBotBtn" wx:if="{{buyState}}" bindtap="lookOrder" src="{{imgUrl+'/newImages6/24.png'}}"></image>
+      <image class="myCenterBotBtn" bindtap="lookOrder" src="{{imgUrl+'/newImages6/24.png'}}"></image>
     </view>
     <view class="taskGroup" wx:if="{{selectNow==1}}">
       <view class="taskSelect" style="justify-content:center;">
@@ -296,12 +296,19 @@
       <view class="lineSty"></view>
       <image class="closeXieyi" bindtap="starMoveHide" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
       <view style="position:relative;">
-        <image style="width:750rpx;height:2190rpx;" src="{{imgUrl+'/newImages6/35.png'}}"></image>
+        <image style="width:750rpx;height:2190rpx;" src="{{imgUrl+'/newImages6/46.png'}}"></image>
         <image class="newImages3-45" bindtap="starMoveHide" src="{{imgUrl+'/newImages3/45.png'}}"></image>
       </view>
       <view class="cardCode" wx:if="{{couponListCode}}">{{couponListCode}}<view bindtap="cardCodeCopy" class="cardCodeCopy">复制</view></view>
     </view>
   </view>
+  <view class="ruleFrame ruleFrame2" wx:if="{{tipWindow2}}">
+    <view class="tipWindowRule">
+      <image class="tipWindowBg" src="{{imgUrl+'/newImages6/51.png'}}"></image>
+      <image class="tipWindowBtn" bindtap="placingControl" src="{{imgUrl+'/newImages6/50.png'}}"></image>
+      <image class="tipWindowClose" bindtap="tipWindowControl" src="{{imgUrl+'/newImages4/27.png'}}"></image>
+    </view>
+  </view>
   <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement>
   <userMsg bindaddress="addressControl" wx:if="{{addressShow}}"></userMsg>
   <placingOrder  bindplacing="placingControl" wx:if="{{placing}}"></placingOrder>

496_dongfengqichen/pages/myCenter/myCenter.wxss

@@ -992,4 +992,45 @@ view{
   display: flex;
   align-items: center;
   flex-direction: column;
+}
+
+
+.ruleFrame{
+  position: fixed;
+  top:0;
+  left: 0;
+  height: calc(100vh - 120rpx);
+  overflow: auto;
+}
+.ruleFrame2{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgba(0,0,0,0.5);
+  z-index: 9;
+}
+.tipWindowRule{
+  position: relative;
+  width: 603rpx;
+  height: 518rpx;
+}
+.tipWindowBg{
+  width: 100%;
+  height: 100%;
+}
+.tipWindowBtn{
+  position: absolute;
+  bottom: 70rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 347rpx;
+  height: 62rpx;
+}
+.tipWindowClose{
+  position: absolute;
+  top: -32rpx;
+  right: -32rpx;
+  width: 42rpx;
+  height: 42rpx;
 }

496_dongfengqichen/pages/placingOrder/placingOrder.wxml

@@ -4,7 +4,7 @@
   <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>
+  <image class="yuyueTop" src="{{imgUrl+'/newImages6/47.png'}}"></image>
   <view class="selectType">
       <view style="position: relative;">
         <image class="newImages2-41" bindtap="cutType" style="margin-bottom:23rpx;" src="{{imgUrl+'/newImages2/41_'+(mobileType==1?'2':'1')+'.png'}}"></image>
@@ -73,7 +73,7 @@
   <view class="receiveFrame" wx:if="{{getBuyState}}">
     <view class="receiveGroup">
       <image class="newImages12" bindtap="closePage" src="{{imgUrl+'/newImages/12.png'}}"></image>
-      <image class="newImages2-1" src="{{imgUrl+'/newImages6/32.png'}}"></image>
+      <image class="newImages2-1" src="{{imgUrl+'/newImages6/49.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>
@@ -83,7 +83,7 @@
       <image class="closeTip" bindtap="tipShowControl" src="{{imgUrl+'/newImages4/15.png'}}"></image>
       <image class="tipGroupBg" src="{{imgUrl+'/newImages4/12.png'}}"></image>
       <view class="tipGroupContent">
-        <image class="tipGroupContentImg" src="{{imgUrl+'/newImages6/33.png'}}"></image>
+        <image class="tipGroupContentImg" src="{{imgUrl+'/newImages6/48.png'}}"></image>
         <image class="tipGroupContentBtn" bindtap="tipShowControl2" src="{{imgUrl+'/newImages4/14.png'}}"></image>
       </view>
     </view>

496_dongfengqichen/pages/placingOrder/placingOrder.wxss

@@ -192,7 +192,7 @@
   display: block;
   margin: 0 auto;
   width: 699rpx;
-  height: 226rpx;
+  height: 225rpx;
   margin-bottom: 45rpx;
 }
 .newImages2-41{
@@ -244,7 +244,7 @@
 }
 .tipGroupContentImg{
   width: 633rpx;
-  height: 1826rpx;
+  height: 1742rpx;
 }
 .tipGroupContentBtn{
   width: 429rpx;

496_dongfengqichen/pages/yuyue/yuyue.wxml

@@ -4,7 +4,7 @@
     <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>
+    <image class="yuyueTop" src="{{imgUrl+'/newImages6/47.png'}}"></image>
     <view class="selectType">
       <view style="position: relative;">
         <image class="newImages2-41" bindtap="cutType" style="margin-bottom:23rpx;" src="{{imgUrl+'/newImages2/41_'+(mobileType==1?'2':'1')+'.png'}}"></image>

496_dongfengqichen/pages/yuyue/yuyue.wxss

@@ -47,7 +47,7 @@
   display: block;
   margin: 0 auto;
   width: 699rpx;
-  height: 226rpx;
+  height: 225rpx;
   margin-bottom: 45rpx;
 }