fix:订单详情页pc字段显示修改

.gitignore

@@ -24,3 +24,5 @@ src/jfw/modules/pc/server/.idea/*
 src/jfw/my_test.go
 src/web/templates/weixin/jylab/testC.html
 src/jfw/modules/pc/client/*
+go_build_web
+go_build_app

src/web/templates/order/pc/medical/detail.html

@@ -120,7 +120,7 @@
                     <div class="clearfix list_tbody">
                         <div class="filter_data">
                             <p><span class="pro_text">产品类型</span>：<span class="pr">医械通</span></p>
-                            <p><span class="dq_text">购买区域</span>：<span class="dq"></span></p>
+                            <p><span class="dq_text">购买区域</span>：<span class="dq">-</span></p>
                             <p><span class="zq_text">订阅周期</span>：<span class="dyzq2">-</span>
                                 <span class="discount-container hide">
                                     <span>+</span>
@@ -147,8 +147,11 @@
                             <p class="pay_time_p" style="">支付时间：<span class="pay_time"></span></p>
                             <!-- <p class="pay_way_p" style="display:none">支付方式：<span class="pay_way"></span></p>
                             <p class="pay_num_p" style="display:none">支付单号：<span class="pay_num"></span></p> -->
-                            <p class="price_p" data-need-before-money>商品总价：<span class="price"></span> &nbsp; <span
-                                    class="valuationList" style="color:#2CB7CA;display:none;cursor:pointer">计费清单</span>
+                            <p class="price_p" data-need-before-money>商品总价：<span class="price"></span>
+
+
+                                <!-- &nbsp; <span
+                                    class="valuationList" style="color:#2CB7CA;display:none;cursor:pointer">计费清单</span> -->
                             </p>
                         </div>
                     </div>
@@ -219,9 +222,16 @@
                                     insetDom.after('<p>实付金额：￥' + formatMoney(getPayMoney) + '元</p>')
                                 }
                                 if (getCouponMoney) {
-                                    insetDom.after('<p>优惠金额：-￥' + formatMoney(getCouponMoney) + '元</p>')
+                                    // insetDom.after('<p>优惠金额：-￥' + formatMoney(getCouponMoney) + '元</p>')
+                                    insetDom.after('<p>优惠金额：-￥' + formatMoney(prodMoney / 100) + '元</p>')
                                 }
                             }
+                            // 价格为 -
+                            if (JSON.parse(r.data.order.filter).area === '-') {
+                                $(".price").text("-");
+                                insetDom.after('<p>优惠金额：- </p>')
+
+                            }
 
                         }
                         insetMoneyItem()
@@ -390,10 +400,20 @@
                                 industry_vip = "全行业";
                             } else {
                                 industry_vip = industry_vip + "个行业";
+                            }
+                             //  判断 大会员时候  区域为 -
+                            if (filterObj.area && filterObj.area === '-') {
+                                region_vip = '-'
                             }
                             $(".dq").html(region_vip);
                             $(".hysl").html(industry_vip);
                         }
+
+                        //  判断 大会员时候  区域为 -
+                        if (filterObj.area && filterObj.area === '-') {
+
+                             $(".dq").html('-');
+                        }
                         //周期
                         if ((r.data.order.vip_starttime != undefined) && (r.data.order.vip_endtime != undefined)) {
                             var start_time_vip = r.data.order.vip_starttime;

src/web/templates/pc/myOrder.html

@@ -441,7 +441,7 @@
                   <!-- 医械通单独处理商品价格 -->
                   <div class="money-group" v-if="item.product_type === '医械通'">
                     <div>商品总价：<span v-if="item.vipInfo.area == '-'">-</span>
-                      <span v-else>-￥@#getProdMoney(item) | FormatNum#@</span>
+                      <span v-else>￥@#getProdMoney(item) | FormatNum#@</span>
                     </div>
                     <div v-if="item.order_status != -2 && item.order_status != -3">
                       优惠金额：<span v-if="item.vipInfo.area == '-'">-</span>
@@ -1054,9 +1054,9 @@
                   vipInfo.industry = vipOriginalInfo.buyerclasscount + '个行业'
                 }
                 //  判断 大会员时候  区域为 -
-                  if (v.filter.area == '-') {
-                    vipInfo.area = '-'
-                  }
+                if (v.filter.area && v.filter.area === '-') {
+                  vipInfo.area = '-'
+                }
               } else {
                 var region_vipArr = v.filter.area;
                 var province_length = 0;
@@ -1071,13 +1071,7 @@
                     }
                   }
                 } else {
-                  //  判断 大会员时候  区域为 -
-                  if (v.filter.area === '-') {
-                    vipInfo.area = '-'
-                  } else {
-                    vipInfo.area = '全国'
-
-                  }
+                    vipInfo.area = '全国';
                 }
                 if (province_length) {
                   vipInfo.area = province_length + '个省级区域'
@@ -1089,9 +1083,9 @@
                   vipInfo.area += city_length + '个地市'
                 }
                 //  判断 大会员时候  区域为 -
-              if (v.filter.area == '-') {
-                vipInfo.area = '-'
-              }
+                if (v.filter.area && v.filter.area === '-') {
+                  vipInfo.area = '-'
+                }
                 if (v.filter.industry && v.filter.industry.length > 0) {
                   vipInfo.industry = v.filter.industry.length + '个行业'
                 } else {
@@ -1099,6 +1093,11 @@
                 }
               }
 
+              //  判断 大会员时候  区域为 -
+              if (v.filter.area && v.filter.area === '-') {
+                vipInfo.area = '-'
+              }
+
               if (v.filter.cyclecount !== undefined && v.filter.cyclecount !== "" && v.filter.cycleunit !== undefined && v.filter.cycleunit !== "") {
                 if (parseInt(v.filter.cycleunit) === 1) {
                   vipInfo.cycle = v.filter.cyclecount + "年"