修改页面

src/views/goods/goods/components/Form.vue

@@ -267,7 +267,9 @@ export default {
       getSpu(id).then((response) => {
         const { data } = response;
         data.pics = JSON.parse(data.pics);
-        data.spec = JSON.parse(data.spec);
+        if(data.spec!=""){
+          data.spec = JSON.parse(data.spec);
+        }       
         this.goodsTagList=data.goodsTagList;
         this.form = data;
         this.open = true;

src/views/goods/goods/components/putShopOffShop.vue

@@ -14,13 +14,16 @@
 				<el-button type="primary" @click="offShop">确 定</el-button>
 			</span>
 		</el-dialog>
+
+    <Form ref="Form" />
 	</div>
 </template>
 
 <script>
 import { putShop, offShop } from "@/api/system/goods";
-
+import Form from "./Form.vue";
 export default {
+  components: { Form},
 	data() {
 		return {
 			id: '',
@@ -41,9 +44,13 @@ export default {
 		},
 		putShop() {
 			putShop({ goodsId: this.id, boo: this.allPut }).then(res => {
-				this.$modal.msgSuccess("上架成功");
-				this.dialogVisible = false;
-				this.$emit('callback')
+        if(res.code==200){
+          this.$modal.msgSuccess("上架成功");
+          this.dialogVisible = false;
+          this.$emit('callback')
+        }else if(res.code==99){
+          this.$refs.Form.handleUpdate(this.id);
+        }
 			})
 		},
 		offShop() {

src/views/goods/spec/index.vue

@@ -46,6 +46,7 @@
           <span v-else>停用</span>
         </template>
       </el-table-column>
+      <el-table-column label="原备注" width="180" align="center" prop="remark"/>
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -77,6 +78,9 @@
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" maxlength="500" show-word-limit/>
         </el-form-item>
+        <el-form-item label="原备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="500" show-word-limit/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-hasPermi="['system:spec:edit']">确 定</el-button>

src/views/order/order/index.vue

@@ -53,6 +53,8 @@
       <el-table-column label="店铺" align="center" prop="shop.name" />
       <el-table-column label="订单来源" align="center" prop="source">
         <template slot-scope="scope">
+          <span v-if="scope.row.source=='1'">点单屏A</span>
+          <span v-if="scope.row.source=='2'">点单屏B</span>
           <span v-if="scope.row.source=='3'">小程序</span>
           <span v-if="scope.row.source=='12'">点单屏</span>
         </template>

src/views/shop/shop/components/TodaySpecial.vue

@@ -31,7 +31,7 @@
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-popconfirm title="确定要移除吗？" @confirm="removeRecommend(scope.row)">
-						<el-button type="text" slot="reference">移除推荐</el-button>
+						<el-button type="text" slot="reference">移除特惠</el-button>
 					</el-popconfirm>
 
 				</template>

src/views/shop/shop/index.vue

@@ -26,7 +26,7 @@
       </el-select>
       </el-form-item>
       <el-form-item label="机器编码" prop="machineCode ">
-        <el-input v-model="queryParams.machineCode" placeholder="请输入店铺地址" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.machineCode" placeholder="请输入机器编码" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['system:shop:query']">搜索</el-button>