Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/order/detail.vue

src/views/club/form.vue

@@ -173,7 +173,7 @@ export default {
           saveAddClubUser(params).then(response => {
             this.loadingbut = false
             this.loadingbuttext = '保存'
-            this.$message({ message: '上线会所成功', type: 'success', center: true })
+            this.$message({ message: response.msg, type: 'success', center: true })
             this.backToList()
           }).catch(() => {
             this.loadingbut = false

src/views/order/detail.vue

@@ -59,49 +59,55 @@
           <el-col :span="12"><b>地址:</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
-          <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
-          <el-col :span="6"><b>已收金额:</b>
-            <template v-if="order.receiptStatus*1===1">¥0.00</template>
-            <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
-          </el-col>
-          <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
-            <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
-          </el-col>
-        </el-row>
+          <el-col :span="6"><b>订单金额：</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+          <el-col :span="6"><b>应收金额：</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
+          <el-col :span="6"><b>已收金额：</b>
+            <template v-if="order.receiptStatus*1===1">¥0</template>
+            <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
+            <el-col :span="6"><b>已收金额:</b>
+              <template v-if="order.receiptStatus*1===1">¥0.00</template>
+              <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
+            </el-col>
+            <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
+              <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+            </el-col>
+          </el-col></el-row>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>经理折扣:</b>
-            <template v-if="order.discountFee<0">¥0.00</template>
-            <template v-else>
-              ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
-              <span style="color:red;">({{ '原:¥' + order.discountFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
-            </template>
-          </el-col>
-          <el-col :span="6"><b>运费:</b>
-            <template v-if="order.freight*1===0">包邮</template>
-            <template v-else-if="order.freight*1===-1">到付</template>
-            <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-            <template v-else>¥{{ order.freight }}</template>
-          </el-col>
-        </el-row>
+          <el-col :span="6"><b>经理折扣：</b>
+            <template v-if="order.discountFee<0">¥0</template>
+            <el-col :span="6"><b>经理折扣:</b>
+              <template v-if="order.discountFee<0">¥0.00</template>
+              <template v-else>
+                ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
+                <span style="color:red;">({{ '原:¥' + order.discountFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+              </template>
+            </el-col>
+            <el-col :span="6"><b>运费:</b>
+              <template v-if="order.freight*1===0">包邮</template>
+              <template v-else-if="order.freight*1===-1">到付</template>
+              <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
+              <template v-else>¥{{ order.freight }}</template>
+            </el-col>
+          </el-col></el-row>
       </div>
       <div class="refund-item">
         <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderID" class="order-item">
           <el-row :gutter="22" class="box-row">
-            <el-col :span="9"><b>子订单号(ID):</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
-            <el-col :span="5"><b>下单时间:</b> {{ shopOrder.orderTime }}</el-col>
-            <el-col :span="5"><b>子订单金额:</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
-            <el-col :span="5"><b>发货状态:</b>
+            <el-col :span="9"><b>子订单号(ID)：</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderID + ')' }}</el-col>
+            <el-col :span="5"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="5"><b>子订单金额：</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="5"><b>发货状态：</b>
               <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
               <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
               <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
             </el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
-            <el-col :span="22"><b>留言:</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>
+            <el-col :span="22"><b>留言：</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
-            <el-col :span="22"><b>供应商:</b> {{ shopOrder.shopName }}</el-col>
+            <el-col :span="22"><b>供应商：</b> {{ shopOrder.shopName }}</el-col>
           </el-row>
           <el-row v-for="op in shopOrder.newOrderProducts" :key="op.orderProductID" :gutter="22" class="product-row">
             <el-col :span="2">
@@ -109,12 +115,12 @@
             </el-col>
             <el-col :span="7">{{ op.name }}</el-col>
             <el-col :span="5">
-              <div class="op-item"><b>数量</b>{{ op.productID*1!==999 ? ('(赠品数): x'+op.num+'('+op.presentNum+')') : (': x'+op.num) }}</div>
-              <div v-if="op.productID*1!==999" class="op-item">规格: {{ op.unit }}</div>
+              <div class="op-item"><b>数量：</b>{{ op.productID*1!==999 ? (op.num) : (op.num) }}</div>
+              <div v-if="op.productID*1!==999" class="op-item"><b>规格：</b>{{ op.unit }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
-              <div class="op-item"><b>单价:</b> ¥{{ op.price | toThousandFloatFilter }}</div>
-              <div class="op-item"><b>总额:</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>单价：</b> ¥{{ op.price | toThousandFloatFilter }}</div>
+              <div class="op-item"><b>总额：</b> ¥{{ op.totalFee | toThousandFloatFilter }}</div>
             </el-col>
             <el-col v-if="op.productID*1!==999" :span="5">
               <div v-if="order.sendOutStatus*1 === 2 || order.sendOutStatus*1 === 3" class="op-item"><b>已发/已收:</b> {{ ((op.num ? op.num : 0) - (op.notOutStore ? op.notOutStore : 0)) + '/' + op.receivedNum }}</div>

src/views/order/refund.vue

@@ -119,7 +119,6 @@ export default {
   data() {
     return {
       list: null,
-      pageNum: 0,
       listLoading: true,
       total: 0,
       searchTimeVal: '',
@@ -151,7 +150,6 @@ export default {
       getRefundList(this.listQuery).then(response => {
         this.list = response.data.results
         this.total = response.data.totalRecord
-        this.pageNum = response.data.index
         this.listLoading = false
       }).catch(() => {
         this.listLoading = false