0923423

src/views/merchant/goods/add.vue

@@ -147,17 +147,24 @@
                                                 <el-input v-model="scope.row.name" maxlength="40" show-word-limit placeholder="SKU名称"></el-input>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column prop="line_price" label="划线价(必填)" width="220">
+                                        <el-table-column prop="line_price" label="划线价(必填)" width="160">
                                             <template #default="scope">
                                                 <el-input v-model="scope.row.line_price" type="number" placeholder="划线价">
-                                                    <template #append>元</template>
+                                                    <template #prepend>¥</template>
                                                 </el-input>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column prop="price" label="支付价(必填)" width="220">
+                                        <el-table-column prop="price" label="支付价(必填)" width="160">
                                             <template #default="scope">
                                                 <el-input v-model="scope.row.price" type="number" placeholder="支付价">
-                                                    <template #append>元</template>
+                                                    <template #prepend>¥</template>
+                                                </el-input>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column prop="custom_price" label="差价(必填)" width="160" v-if="formData.product_type == 11">
+                                            <template #default="scope">
+                                                <el-input v-model="scope.row.custom_price" type="number" placeholder="差价">
+                                                    <template #prepend>¥</template>
                                                 </el-input>
                                             </template>
                                         </el-table-column>
@@ -656,7 +663,7 @@ export default {
             })
         },
         addSkuSpecs(){
-            this.skuSpecs.push({"image":"","sku_id":this.generate(),"name":"","line_price":1,"price":1,"is_default":false,"specs":[]});
+            this.skuSpecs.push({"image":"","sku_id":this.generate(),"name":"","line_price":1,"custom_price":1,"price":1,"is_default":false,"specs":[]});
         },
         removeItemSku(index){
             this.skuSpecs.splice(index,1)

src/views/merchant/goods/edit.vue

@@ -147,21 +147,28 @@
                                                 <el-input v-model="scope.row.name" maxlength="40" show-word-limit placeholder="SKU名称"></el-input>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column prop="line_price" label="划线价(必填)" width="220">
+                                        <el-table-column prop="line_price" label="划线价(必填)" width="160">
                                             <template #default="scope">
                                                 <el-input v-model="scope.row.line_price" type="number" placeholder="划线价">
-                                                    <template #append>元</template>
+                                                    <template #prepend>¥</template>
                                                 </el-input>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column prop="price" label="支付价(必填)" width="220">
+                                        <el-table-column prop="price" label="支付价(必填)" width="160">
                                             <template #default="scope">
                                                 <el-input v-model="scope.row.price" type="number" placeholder="支付价">
-                                                    <template #append>元</template>
+                                                    <template #prepend>¥</template>
                                                 </el-input>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column label="操作" align="left" fixed="right">
+                                        <el-table-column prop="custom_price" label="差价(必填)" width="160" v-if="formData.product_type == 11">
+                                            <template #default="scope">
+                                                <el-input v-model="scope.row.custom_price" type="number" placeholder="差价">
+                                                    <template #prepend>¥</template>
+                                                </el-input>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="操作" align="left" fixed="right" width="120">
                                             <template #default="scope">
                                                 <el-button type="danger" size="small" @click="removeItemSku(scope.$index)" icon="el-icon-delete">删除</el-button>
                                                 <el-button size="small" @click="itemSkuView(scope.$index,scope.row)">规格详情</el-button>

src/views/service/dashboard/index.vue

@@ -116,18 +116,9 @@
                 </el-col>
             </el-row>
         </div>
-        <el-row :gutter="20">
-            <el-col :span="this.$store.state.global.ismobile?24:12" :xs="24">
-                <div class="total-order-status mt10">
-                    <scEcharts height="500px" :option="option2"></scEcharts>
-                </div>
-            </el-col>
-            <el-col :span="this.$store.state.global.ismobile?24:12" :xs="24">
-                <div class="total-order-status mt10">
-                    <scEcharts height="500px" :option="option"></scEcharts>
-                </div>
-            </el-col>
-        </el-row>
+        <div class="total-order-status mt10">
+            <scEcharts height="500px" :option="option"></scEcharts>
+        </div>
     </el-main>
 </template>