去掉订金

hdApp/src/admin/order/detail.vue

@@ -91,9 +91,6 @@
         </view>
         <view class="module-det">
           <view class="order-msg-blo">
-            <view v-if="!$util.isEmpty(orderInfo.shOrderMap)" style="color:#856404;font-size:26upx;">
-              本单有售后付款：<text v-for="(shItem, shIndex) in orderInfo.shOrderMap" :key="shIndex" style="margin-right:10upx;" @click="goShOrder(shItem)">{{ shItem.shOrderSn }}</text>
-            </view>
             <view class="msg-list">
               <view class="label">状态：</view>
               <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'待收货':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
@@ -189,6 +186,9 @@
               <view class="value" style="color:red;font-weight:bold;">-￥{{ orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0 }}</view>
               <button class="admin-button-com mini-btn" @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})" style="position:absolute;right:0upx;top:0upx;">售后记录</button>
             </view>
+            <view v-if="!$util.isEmpty(orderInfo.shOrderMap)" style="color:#856404;font-size:26upx;">
+              本单有售后支出：<text v-for="(shItem, shIndex) in orderInfo.shOrderMap" :key="shIndex" style="margin-right:10upx;" @click="goShOrder(shItem)">{{ shItem.shOrderSn }}</text>
+            </view>
             <view class="msg-list">
               <view class="label">实际：</view>
               <view class="value">{{orderInfo.forward==0?'':'-'}}￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}</view>
@@ -317,9 +317,9 @@ export default {
     edit(item){
       this.$util.pageTo({url:'/admin/order/modify?id='+item.id})
     },
-	goRefund(){
-		this.$util.pageTo({url:'/admin/order/refund?id='+this.option.id})
-	},
+    goRefund(){
+      this.$util.pageTo({url:'/admin/order/refund?id='+this.option.id})
+    },
     goShOrder(info){
       this.$util.pageTo({url:'/admin/order/detail?id='+info.shOrderId})
     },

hdApp/src/admin/order/itemOrder.vue

@@ -95,6 +95,7 @@ export default {
 
     },
     batchFh(){
+      //注意要考虑售后付款单的情况！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
       this.$msg('开发中')
       return false
       let that = this
@@ -113,6 +114,7 @@ export default {
       }
     },
     batchPrint(){
+      //注意要考虑售后付款单的情况！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
       this.$msg('开发中')
       return false
       let that = this

hdApp/src/admin/order/workOrder.vue

@@ -26,12 +26,6 @@
           <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3 && form.hasPay == 1">
-          <view class="tui-title">订金</view>
-          <input type="digit" @focus="dj=''" style="width:260upx;" v-model="dj" placeholder-class="tui-placeholder" placeholder="选填"/>
-          <text style="color:red;font-weight:bold;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
-        </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">收款方式</view>
             <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
@@ -118,7 +112,6 @@ export default {
       kindListData:[],
       kindSelectedData:{},
       currentImgData:[],
-      dj:'',
       numSelectedData:{num:0,name:0},
       flowerNumList:[{num:9,name:9},{num:11,name:11},{num:16,name:16},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
     };
@@ -141,14 +134,6 @@ export default {
           price = parseFloat(price.toFixed(2))
         }
         return price
-    },
-    debtFinalPrice(){
-      let price = 0
-      if(Number(this.dj) > 0 && Number(this.orderTotalPrice)){
-          price = Number(this.orderTotalPrice) - Number(this.dj)
-          price = parseFloat(price.toFixed(2))
-      }
-      return price
     }
   },
   methods: {
@@ -212,12 +197,6 @@ export default {
         this.$msg('请填写单价')
         return false
       }
-      if(Number(this.dj)>0){
-        if(Number(this.dj) >= Number(this.orderTotalPrice)){
-          this.$msg('订金要小于总金额')
-          return false
-        }
-      }
       if(this.$util.isEmpty(this.form.flowerNum) || Number(this.form.flowerNum)<=0){
           this.$msg('请选择每份用材数量')
           return false
@@ -243,7 +222,7 @@ export default {
       that.$util.confirmModal({content:'确认提交？'},() => {
           uni.showLoading({mask:true})
           let name = that.kindSelectedData.name ? that.kindSelectedData.name : ''
-          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,dj:this.dj,name:name,kindName:name,customId:customId}).then((res) => {
+          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,name:name,kindName:name,customId:customId}).then((res) => {
             uni.hideLoading()
             that.pageTo({url: '/admin/order/workOrderResult',type:2,query:{id:res.data.id}})
           })

mallApp/src/pages/order/detail.vue

@@ -1,22 +1,22 @@
 <template>
-  <div class="app-content">
-    <div class="page-top">
-      <div class="page-top-img">
+  <view class="app-content">
+    <view class="page-top">
+      <view class="page-top-img">
         <image mode="widthFix" :src="`${constant.imgUrl}/retail/order/bg.png`" alt />
-      </div>
-      <div class="page-top-det">
-        <div>
-          <div class="page-status">{{ data.status | constantfilter('ORDER_STATUS') }}</div>
-        </div>
-        <div class="page-status-img">
+      </view>
+      <view class="page-top-det">
+        <view>
+          <view class="page-status">{{ data.status | constantfilter('ORDER_STATUS') }}</view>
+        </view>
+        <view class="page-status-img">
           <img :src="statusImg" alt />
-        </div>
-      </div>
-    </div>
-    <div class="page-det">
-      <div class="module-com">
-        <div class="module-tit">商品信息</div>
-        <div class="module-det">
+        </view>
+      </view>
+    </view>
+    <view class="page-det">
+      <view class="module-com">
+        <view class="module-tit">商品信息</view>
+        <view class="module-det">
           <block v-if="!$util.isEmpty(data.goodsInfoList)">
             <list-module v-for="(items, subIndex) in data.goodsInfoList" :key="subIndex" :info="items" />
           </block>
@@ -25,105 +25,108 @@
             <orderItem v-for="(info, idx) in data.itemList" :key="idx" :info="info" ></orderItem>
           </block>
 
-        </div>
-      </div>
-      <div class="module-com order-msg">
-        <div class="module-tit">订单信息</div>
-        <div class="module-det">
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">收花人</div>
-              <div class="value">{{ data.receiveUserName }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">电话</div>
-              <div class="value">{{ data.receiveMobile }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">地址</div>
-              <div class="value">{{ data.fullAddress }}<block v-if="!$util.isEmpty(data.showAddress)">（{{data.showAddress}}）</block></div>
-            </div>
-          </div>
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">送达时间</div>
-              <div v-if="data.reachDate == '0000-00-00'" class="value"></div>
-              <div v-else class="value">{{ data.reachDate ? data.reachDate+' '+reachPeriodInfo : '' }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">贺卡内容</div>
-              <div class="value">{{ data.cardInfo}}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">匿名派送</div>
-              <div class="value">{{ data.anonymity == 1 ? '是' : '' }}</div>
-            </div>
-            <div class="msg-list" v-if="!$util.isEmpty(data.remark)">
-              <div class="label">备注</div>
-              <div class="value">{{ data.remark }}</div>
-            </div>
-          </div>
-          <div class="order-msg-blo">
-            <div class="msg-list">
-              <div class="label">订单号</div>
-              <div class="value">{{ data.orderSn }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">时间</div>
-              <div class="value">{{ data.addTime ? data.addTime.substr(5,11) : ''}}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">支付方式</div>
-              <div class="value">{{ payWayInfo }}</div>
-            </div>
-            <div class="msg-list" v-if="Number(data.sendCost)>0">
-              <div class="label">运费</div>
-              <div class="value">￥{{ data.sendCost?parseFloat(data.sendCost):0 }}</div>
-            </div>
-            <div class="msg-list">
-              <div class="label">合计</div>
-              <div class="value">{{data.forward==0?'':'-'}}￥{{ data.orderPrice?parseFloat(data.orderPrice):0 }}</div>
-            </div>
+        </view>
+      </view>
+      <view class="module-com order-msg">
+        <view class="module-tit">订单信息</view>
+        <view class="module-det">
+          <view v-if="!$util.isEmpty(data.shOrderMap)" style="color:#856404;font-size:26upx;">
+            本单有售后收入：<text v-for="(shItem, shIndex) in data.shOrderMap" :key="shIndex" style="margin-right:10upx;" @click="goShOrder(shItem)">{{ shItem.shOrderSn }}</text>
+          </view>
+          <view class="order-msg-blo">
+            <view class="msg-list">
+              <view class="label">收花名称</view>
+              <view class="value">{{ data.receiveUserName }}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">电话号码</view>
+              <view class="value">{{ data.receiveMobile }}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">地址信息</view>
+              <view class="value">{{ data.fullAddress }}<block v-if="!$util.isEmpty(data.showAddress)">（{{data.showAddress}}）</block></view>
+            </view>
+          </view>
+          <view class="order-msg-blo">
+            <view class="msg-list">
+              <view class="label">送达时间</view>
+              <view v-if="data.reachDate == '0000-00-00'" class="value"></view>
+              <view v-else class="value">{{ data.reachDate ? data.reachDate+' '+reachPeriodInfo : '' }}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">贺卡内容</view>
+              <view class="value">{{ data.cardInfo}}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">匿名派送</view>
+              <view class="value">{{ data.anonymity == 1 ? '是' : '' }}</view>
+            </view>
+            <view class="msg-list" v-if="!$util.isEmpty(data.remark)">
+              <view class="label">备注信息</view>
+              <view class="value">{{ data.remark }}</view>
+            </view>
+          </view>
+          <view class="order-msg-blo">
+            <view class="msg-list">
+              <view class="label">订单编号</view>
+              <view class="value">{{ data.orderSn }}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">创建时间</view>
+              <view class="value">{{ data.addTime ? data.addTime.substr(5,11) : ''}}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">支付方式</view>
+              <view class="value">{{ payWayInfo }}</view>
+            </view>
+            <view class="msg-list" v-if="Number(data.sendCost)>0">
+              <view class="label">订单运费</view>
+              <view class="value">￥{{ data.sendCost?parseFloat(data.sendCost):0 }}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">订单合计</view>
+              <view class="value">￥{{ data.orderPrice?parseFloat(data.orderPrice):0 }}</view>
+            </view>
 
-            <div class="msg-list" v-if="Number(data.remainDebtPrice)>0">
-              <div class="label">待结</div>
-              <div class="value" style="color:red;font-weight:bold;">￥{{ data.remainDebtPrice?parseFloat(data.remainDebtPrice):0 }}</div>
-            </div>
+            <view class="msg-list" v-if="Number(data.remainDebtPrice)>0">
+              <view class="label">订单待结</view>
+              <view class="value" style="color:red;font-weight:bold;">￥{{ data.remainDebtPrice?parseFloat(data.remainDebtPrice):0 }}</view>
+            </view>
 
-          </div>
-        </div>
-      </div>
+          </view>
+        </view>
+      </view>
       <block v-if="data.status == 0">
-        <div class="module-com coupon-wrap" v-if="!$util.isEmpty(discountArr)">
-          <div class="module-tit">优惠信息</div>
-          <div class="module-det">
+        <view class="module-com coupon-wrap" v-if="!$util.isEmpty(discountArr)">
+          <view class="module-tit">优惠信息</view>
+          <view class="module-det">
             <app-coupon-sel ref="couponSel" :price="data.prePrice * data.goodsNum" :discountArr="['member', 'coupon']" />
-          </div>
-        </div>
+          </view>
+        </view>
       </block>
       <block v-else>
-        <div class="module-com coupon-wrap" v-if="data.discountAmount && Number(data.discountAmount) > 0" >
-          <div class="module-tit">优惠信息</div>
-          <div class="module-det">
-            <div class="app-color-3" >{{ data.discountType == 1 ? '优惠券' : data.discountType == 2 ? '会员优惠' : '随机优惠' }}</div>
-            <div class="app-price">-￥{{ data.discountAmount?parseFloat(data.discountAmount):0 }}</div>
-          </div>
-        </div>
+        <view class="module-com coupon-wrap" v-if="data.discountAmount && Number(data.discountAmount) > 0" >
+          <view class="module-tit">优惠信息</view>
+          <view class="module-det">
+            <view class="app-color-3" >{{ data.discountType == 1 ? '优惠券' : data.discountType == 2 ? '会员优惠' : '随机优惠' }}</view>
+            <view class="app-price">-￥{{ data.discountAmount?parseFloat(data.discountAmount):0 }}</view>
+          </view>
+        </view>
       </block>
-    </div>
-    <div class="page-btn app-footer">
-      <div class="flex-center" style="align-items: center; display: flex;">
+    </view>
+    <view class="page-btn app-footer">
+      <view class="flex-center" style="align-items: center; display: flex;">
         <span style="font-size:40upx; line-height: 1;"></span>
         <span class="app-price" style="display: flex; align-items: center;">
-          <span style="font-size:40upx; line-height: 1;color:black;">金额{{data.forward==0?'':'-'}}￥</span>
+          <span style="font-size:40upx; line-height: 1;color:black;">{{data.forward==0?'':'售后收入 '}}￥</span>
           <span style="font-size:40upx; line-height: 1;color:black;">{{ data.actPrice?parseFloat(data.actPrice):0 }}</span>
         </span>
-      </div>
+      </view>
       <template v-if="data.status == 1">
         <button class="button-com red" @click="payFn">立即支付</button>
       </template>
-    </div>
-  </div>
+    </view>
+  </view>
 </template>
 <script>
 import { mapGetters } from "vuex";
@@ -161,6 +164,9 @@ export default {
     }
   },
   methods: {
+    goShOrder(info){
+      this.$util.pageTo({url:'/pages/order/detail?id='+info.shOrderId})
+    },
     init() {
       this.getDetail().then(() => {
         getShopUser().then(res => {

mallApp/src/pages/order/orderItem.vue

@@ -43,10 +43,10 @@
         </view>
       </view>
       <view class="item-price">
-          <view v-if="info.orderPrice == info.actPrice">{{info.forward==0?'':'-'}}¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</view>
+          <view v-if="info.orderPrice == info.actPrice">{{info.forward==0?'':'售后收入 '}}¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</view>
           <view v-else>
             <text style="text-decoration: line-through;color:#847676;">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</text>
-            <text style="margin-left:10upx;">{{info.forward==0?'':'-'}}¥{{ info.actPrice ? parseFloat(info.actPrice):0 }}</text>
+            <text style="margin-left:10upx;">{{info.forward==0?'':'售后收入 '}}¥{{ info.actPrice ? parseFloat(info.actPrice):0 }}</text>
           </view>
         <text class="iconfont iconxiangyou"></text>
       </view>