From f8b3df945a1f5c135e6a106cbcd861da732f2629 Mon Sep 17 00:00:00 2001
From: antploy <antploy.ni@meidd.com>
Date: Fri, 8 Oct 2021 11:24:25 +0800
Subject: [PATCH] 全额预售优化

---
 .idea/mshopweapp.iml                            |  8 --------
 packageC/pages/presell/cart/cart.wxml           |  7 +++++--
 packageC/pages/presell/cart/cart2_pre.wxml      |  6 +++---
 packageC/pages/presell/goodsInfo/goodsInfo.wxml | 15 ++++++++++++---
 setting.js                                      | 15 ---------------
 5 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 .idea/mshopweapp.iml
 delete mode 100644 setting.js

diff --git a/.idea/mshopweapp.iml b/.idea/mshopweapp.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/mshopweapp.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index 9f4fdb5..63cc9bc 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -64,7 +64,8 @@
 
             <view class="pdb20 flex t-c fs22 c-7b">
                 <view class="f1">
-                    <view>付定金</view>
+                    <view wx:if="{{presell.presell_type!==1}}">付定金</view>
+                    <view wx:else>支付金额</view>
                     <view wx:if="{{presell.deposit_pay_time>0}}" class="box">
                         <text class="iconfont icon-yes"></text>
                     </view>
@@ -316,7 +317,8 @@
         </view>
 
         <view class="information bdr14 mgt20">
-            <view class="item">
+            <block wx:if="{{act.presell_type==0}}">
+                <view class="item">
                 <view>阶段一：定金（待付款）</view>
                 <view class="co-red">￥{{filters.toFix(pre_arr.presell_money*order.order_goods.goods_num,2)}}元</view>
             </view>
@@ -324,6 +326,7 @@
                 <view>阶段二：尾款</view>
                 <view class="co-red">￥{{filters.toFix(tail_pay,2)}}元</view>
             </view>
+            </block>
         </view>
     </view>
 
diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml
index e5c61df..ce0e6b8 100644
--- a/packageC/pages/presell/cart/cart2_pre.wxml
+++ b/packageC/pages/presell/cart/cart2_pre.wxml
@@ -122,8 +122,8 @@
 
         <!-- 不下单的时候退款定金 -->
         <view class="information bdr14" style="margin-bottom: 20rpx" wx:if="{{!act.is_refundmoney}}">
-            <view class="item ai-center">
-                <view>我同意预售商品不退定金</view>
+            <view wx:if="{{act.presell_type==0}}" class="item ai-center">
+                <view >我同意预售商品不退定金</view>
                 <switch style="transform: scale(0.7);position: relative; right: -24rpx" type="switch" checked="{{agree_no_ref?true:false}}" bindchange="switchChange"/>
             </view>
         </view>
@@ -136,7 +136,7 @@
 								<view class="yu_er">使用余额 :￥{{yuer}} </view>
 							 </view>
 						 </view>
-            <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
+            <view class="item" wx:if="{{act.presell_type==1}}">
                 <view>商品金额</view>
                 <view class="co-red">￥ {{formData.all_price}}元</view>
             </view>
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index 53a7b56..227784c 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -104,7 +104,7 @@
               </view>
             </view>
           </view>
-          <view class="fs24" style="padding-bottom:20rpx">
+          <view wx:if="{{presellForm.presell_type==0}}" class="fs24" style="padding-bottom:20rpx">
             <view class="stock" style="color:#999">尾款：{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}}</view>
           </view>
           <view class="goods-num">
@@ -504,11 +504,19 @@
     </view>
 
     <view class="line" bindtap="openSpecModel" data-ind="2" style="margin-left: 10rpx; padding-left: 10rpx">
-      <view class="">支付定金</view>
+      <block wx:if="{{presellForm.presell_type==0}}">
+        <view class="">支付定金</view>
       <view class="flex">
         定金
         <text class="rmb">{{presellList.presell_money}}</text>
       </view>
+      </block>
+      <block wx:else>
+        <view class="">支付金额</view>
+      <view class="flex">
+        <text class="rmb" style="margin-left:10rpx;">{{presellList.presell_price}}</text>
+      </view>
+      </block>
     </view>
   </view>
 </view>
@@ -639,7 +647,8 @@
                   <block wx:else>
                     <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"
                           data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">
-                          支付定金（￥{{pre_arr.presell_money}}）
+                          <text wx:if="{{presellForm.presell_type==0}}">支付定金（￥{{pre_arr.presell_money}}）</text>
+                          <text wx:else>支付金额（￥{{pre_arr.presell_price}}）</text>
                     </view>
                   </block>
 
diff --git a/setting.js b/setting.js
deleted file mode 100644
index 5f330c7..0000000
--- a/setting.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = {
-    appName: "派派通",
-    versionCode: "1.0.0",
-    appLogo: "../../../images/logo.png",
-    // url: "https://test-weshop.yolipai.net",
-    url: "https://test-weshop.xinda100.cn",
-    //url:"https://weshop.yolipai.net", //外网的网址
-    //url:"http://172.20.3.121:8085", //明海的网址
-    //url:"http://172.20.3.102:8085", //自己的网址
-    banner_err:"../../../images/del/logo.png",
-    imghost: "https://mshopimg.yolipai.net/",
-    share: {},
-    stoid:1,
-    
-};
--
libgit2 0.21.4