运费

mallApp/src/components/app-delivery.vue

@@ -51,7 +51,7 @@
 
       <tui-list-cell class="line-cell" :hover="false" v-show="showCardInfo">
         <div class="tui-title">贺卡内容</div>
-        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" style="width:100%;" placeholder="请填写内容" />
+        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" style="width:100%;" placeholder="请填写，不要贺卡请写不要贺卡" />
 
       </tui-list-cell>
 
@@ -69,8 +69,8 @@
     <!-- 备注 -->
     <div class="module-com remark-wrap">
       <tui-list-cell class="line-cell" :hover="false">
-        <div class="tui-title">其它备注</div>
-        <input v-model="form.remark" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="remark" placeholder="请填写备注信息（选填）" />
+        <div class="tui-title">备注内容</div>
+        <input v-model="form.remark" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="remark" placeholder="选填" />
       </tui-list-cell>
     </div>
     <!-- 省市联动 -->

mallApp/src/pages/billing/affirmGhs.vue

@@ -77,7 +77,7 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2 || form.sendType == 0" @click="modifyAddress">
 						<view class="tui-title">收花地址</view>
 						<view v-if="!$util.isEmpty(userInfo.lat) && !$util.isEmpty(userInfo.long)">
-							<view><text>{{userInfo.fullAddress}}</text></view>
+							<view><text>{{userInfo.address}}</text></view>
 							<view v-if="userInfo.showAddress!=userInfo.fullAddress" style="color:#848181;"><text>{{userInfo.showAddress}}</text></view>
 						</view>
 						<view v-else>

mallApp/src/pages/order/buy.vue

@@ -57,7 +57,7 @@ import AppListModule from "@/components/module/app-order-list2";
 import { getShopUser } from "@/utils/auth";
 import { getOrderShop } from "@/utils/config";
 import { createOrder,newFreight } from "@/api/order";
-import { getUserDistance, getHasMap } from "@/api/express";
+import { getHasMap } from "@/api/express";
 export default {
   name: "buy",
   components: {
@@ -140,13 +140,6 @@ export default {
       let long = ref.region.longitude;
       this.form.lat = lat
       this.form.long = long
-      // getUserDistance({ lat: lat, lng: long }).then(res => {
-      //   const data = res.data || {}
-      //   this.freightPrice = data.fee?parseFloat(data.fee):0;
-      //   this.showDistance = data.showDistance || 0;
-      //   this.form.sendDistance = this.showDistance
-      // });
-      // 当需要的数据都具备时，调用 newFreight 计算运费
       try {
         const deliveryForm = (ref && ref.form) ? ref.form : {};
         const goodsInfo = this.goodsInfo || {};
@@ -199,16 +192,12 @@ export default {
       let form = {}
       if (this.form.sendType == 2) {
         if(this.form.hasMap == 0) {
-          this.$msg('由于地图定位服务停用，无法使用代叫跑腿')
-          return
-        }
-        if(this.freightPrice <= 0 && this.isFreight) {
-          this.$msg('选择代叫跑腿，必须获取运费')
+          this.$msg('跑腿不可用，请用其它方式')
           return
         }
         const deliveryRef = this.$refs.appDelivery
         if(!deliveryRef || !deliveryRef.form){
-          this.$msg("请完善配送信息")
+          this.$msg("请填写地址")
           return
         }
         form = deliveryRef.form

mallApp/src/pages/order/detail.vue

@@ -67,52 +67,37 @@
             </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" v-if="data.discountAmount && Number(data.discountAmount) > 0">
+              <view class="label">优惠金额</view>
+              <view class="value">-￥{{ data.discountAmount?parseFloat(data.discountAmount):0 }}</view>
+            </view>
             <view class="msg-list">
               <view class="label">订单合计</view>
               <view class="value">￥{{ data.orderPrice?parseFloat(data.orderPrice):0 }}</view>
             </view>
-
             <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>
-
+            <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>
         </view>
       </view>
-      <block v-if="data.status == 0">
-        <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']" />
-          </view>
-        </view>
-      </block>
-      <block v-else>
-        <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>
     </view>
     <view class="page-btn app-footer">
       <view class="flex-center" style="align-items: center; display: flex;">