Zory hai 3 semanas
pai
achega
443d282fde

+ 7 - 10
src/views/merchant/goods/add.vue

@@ -29,7 +29,7 @@
                                     <div class="el-form-item-msg"></div>
                                 </el-form-item>
                                 <el-row :gutter="15">
-                                    <el-col :span="formData.product_type==11?8:12">
+                                    <el-col :span="12">
                                         <el-form-item label="顾客实际需支付" prop="price">
                                             <el-input v-model="formData.price" min="0" type="number" clearable placeholder="请输入">
                                                 <template #append>元</template>
@@ -37,7 +37,7 @@
                                             <div class="el-form-item-msg"></div>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="formData.product_type==11?8:12">
+                                    <el-col :span="12">
                                         <el-form-item label="划线价" prop="line_price">
                                             <el-input v-model="formData.line_price" min="0" type="number" clearable placeholder="请输入">
                                                 <template #append>元</template>
@@ -45,14 +45,6 @@
                                             <div class="el-form-item-msg"></div>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8" v-if="formData.product_type==11">
-                                        <el-form-item label="差价金额" prop="custom_price">
-                                            <el-input v-model="formData.custom_price" type="number" clearable placeholder="请输入">
-                                                <template #append>元</template>
-                                            </el-input>
-                                            <div class="el-form-item-msg"></div>
-                                        </el-form-item>
-                                    </el-col>
                                 </el-row>
                                 <fieldset>
                                     <legend><el-tag>商品搭配</el-tag></legend>
@@ -265,6 +257,11 @@
                                                 </el-radio>
                                             </template>
                                         </el-popover>
+                                        <el-radio :label="1">
+                                            <template #default>
+                                                <div class="radio-flex">全渠道</div>
+                                            </template>
+                                        </el-radio>
                                     </el-radio-group>
                                     <div class="el-form-item-msg"></div>
                                 </el-form-item>

+ 7 - 10
src/views/merchant/goods/edit.vue

@@ -32,7 +32,7 @@
                                     <div class="el-form-item-msg"></div>
                                 </el-form-item>
                                 <el-row :gutter="15">
-                                    <el-col :span="formData.product_type==11?8:12">
+                                    <el-col :span="12">
                                         <el-form-item label="顾客实际需支付" prop="price">
                                             <el-input v-model="formData.price" min="0" type="number" clearable placeholder="请输入">
                                                 <template #append>元</template>
@@ -40,7 +40,7 @@
                                             <div class="el-form-item-msg"></div>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="formData.product_type==11?8:12">
+                                    <el-col :span="12">
                                         <el-form-item label="划线价" prop="line_price">
                                             <el-input v-model="formData.line_price" min="0" type="number" clearable placeholder="请输入">
                                                 <template #append>元</template>
@@ -48,14 +48,6 @@
                                             <div class="el-form-item-msg"></div>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="8" v-if="formData.product_type==11">
-                                        <el-form-item label="差价金额" prop="custom_price">
-                                            <el-input v-model="formData.custom_price" min="0" type="number" clearable placeholder="请输入">
-                                                <template #append>元</template>
-                                            </el-input>
-                                            <div class="el-form-item-msg"></div>
-                                        </el-form-item>
-                                    </el-col>
                                 </el-row>
                                 <fieldset>
                                     <legend><el-tag>商品搭配</el-tag></legend>
@@ -268,6 +260,11 @@
                                                 </el-radio>
                                             </template>
                                         </el-popover>
+                                        <el-radio :label="1">
+                                            <template #default>
+                                                <div class="radio-flex">全渠道</div>
+                                            </template>
+                                        </el-radio>
                                     </el-radio-group>
                                     <div class="el-form-item-msg"></div>
                                 </el-form-item>

+ 3 - 1
src/views/service/order/index/components/table.vue

@@ -116,7 +116,9 @@
                 <!-- 发货后退款 -->
                 <div class="order-name" v-if="scope.row.status == 8">
                     <span>退款审核中</span>
-                    <span class="dec">已发快递,等待审核拦截</span>
+                    <span class="dec">
+                        {{ scope.row.express_status == 2 ? '货物运输中' : '待发货' }}
+                    </span>
                 </div>
                 <!-- 核销后退款 -->
                 <div class="order-name" v-if="scope.row.status == 9">

+ 3 - 1
src/views/service/order/refund/components/table.vue

@@ -116,7 +116,9 @@
                 <!-- 发货后退款 -->
                 <div class="order-name" v-if="scope.row.status == 8">
                     <span>退款审核中</span>
-                    <span class="dec">已发快递,等待审核拦截</span>
+                    <span class="dec">
+                        {{ scope.row.express_status == 2 ? '货物运输中' : '待发货' }}
+                    </span>
                 </div>
                 <!-- 核销后退款 -->
                 <div class="order-name" v-if="scope.row.status == 9">