云音箱设置

ghsApp/src/admin/home/me.vue

@@ -99,7 +99,7 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">云喇叭设置</view>
+              <view class="tui-title">云音箱</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">

ghsApp/src/admin/shop/trumpet.vue

@@ -3,36 +3,25 @@
     <div>
       <form @submit="formSubmit">
         <div class="module-com input-line-wrap">
-
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title">编号（SN）：</div>
-            <input
-              v-model="form.lbSn"
-              placeholder-class="phcolor"
-              class="tui-input"
-              name="lbSn"
-              placeholder="请填写编号"
-              maxlength="50"
-              type="number"
-            />
+            <input v-model="form.lbSn" @focus="form.lbSn=''" placeholder-class="phcolor" class="tui-input" name="lbSn" placeholder="请填写编号" maxlength="50" type="number" />
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">版本号：</div>
+            <input v-model="form.lbVersion" @focus="form.lbVersion=''" placeholder-class="phcolor" class="tui-input" name="lbVersion" placeholder="请填写版本号" maxlength="50" type="number" />
           </tui-list-cell>
-
         </div>
-
         <div class="confirm-btn">
-          <button class="admin-button-com big blue" formType="submit">
-            提交
-          </button>
+          <button class="admin-button-com big blue" formType="submit">提交</button>
         </div>
       </form>
     </div>
   </div>
 </template>
-
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 import AppAvatarModule from "@/components/module/app-avatar";
-const form = require("@/utils/formValidation.js");
 import { getLb,addCloudLb } from "@/api/shop";
 export default {
   name: "shopLb",
@@ -43,24 +32,17 @@ export default {
   data() {
     return {
       form: {
-        lbSn: ""
+        lbSn: "",
+        lbVersion:0
       }
     };
   },
-  onLoad() {
-  },
-  onShow() {
-    uni.setNavigationBarTitle({
-      title: `收款播报设置`,
-    });
-  },
   methods: {
     async init() {
-      try {
-        const { data } = await getLb();
-        this.form.lbSn = data.lbSn;
-        this.$forceUpdate();
-      } finally {}
+      const { data } = await getLb();
+      this.form.lbSn = data.lbSn;
+      this.form.lbVersion = data.lbVersion
+      this.$forceUpdate();
     },
     confirmFn() {
       addCloudLb(this.form).then((res) => {
@@ -73,13 +55,6 @@ export default {
       });
     },
     formSubmit(e) {
-      let rules = [
-        {
-          name: "lbSn",
-          rule: ["required"],
-          msg: ["请填写编号"],
-        }
-      ]
       this.confirmFn();
     },
   },

ghsApp/src/api/shop/index.js

@@ -65,12 +65,12 @@ export const getPrint = data => {
 	return https.get('/shop-ext/get-print', data)
 }
 
-//添加云喇叭
+//添加云音箱
 export const addCloudLb = data => {
 	return https.get('/shop-ext/add-lb', data)
 }
 
-//获取云喇叭信息
+//获取云音箱信息
 export const getLb = data => {
 	return https.get('/shop-ext/get-lb', data)
 }

ghsApp/src/pages.json

@@ -160,7 +160,7 @@
 				{"path": "list","style": {"navigationBarTitleText": "门店"}},
 				{"path": "add","style": {"navigationBarTitleText": ""}},
 				{"path": "print","style": {"navigationBarTitleText": "云打印"}},
-				{"path": "trumpet","style": {"navigationBarTitleText": "收款播报设置"}},
+				{"path": "trumpet","style": {"navigationBarTitleText": "云音箱"}},
 				{"path": "changeShop","style": {"navigationBarTitleText": "切换门店"}},
 				{"path": "sk","style": {"navigationBarTitleText": "自用门店设置"}},
 				{"path": "password","style": {"navigationBarTitleText": "密码修改"}},

hdApp/src/admin/home/me.vue

@@ -81,21 +81,21 @@
               <view class="tui-title">前台小票机</view>
             </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">前台云喇叭</view>
+              <view class="tui-title">前台云音箱</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/makePrint' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">操作台小票机</view>
             </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/admin/shop/makeTrumpet' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">操作台云喇叭</view>
+              <view class="tui-title">操作台云音箱</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/mtPrint' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">美团小票机</view>
             </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/admin/shop/mtTrumpet' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">美团云喇叭</view>
+              <view class="tui-title">美团云音箱</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/jc/index' })" class="line-cell" :hover="false" :arrow="true">

hdApp/src/admin/shop/makeTrumpet.vue

@@ -3,14 +3,15 @@
     <div>
       <form @submit="formSubmit">
         <div class="module-com input-line-wrap">
-
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title">编号（SN）：</div>
             <input v-model="form.makeLbSn" placeholder-class="phcolor" class="tui-input" name="makeLbSn" placeholder="请填写编号" maxlength="50" type="number" />
           </tui-list-cell>
-
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">版本号：</div>
+            <input v-model="form.makeLbVersion" placeholder-class="phcolor" class="tui-input" name="makeLbVersion" placeholder="请填写编号" maxlength="50" type="number" />
+          </tui-list-cell>
         </div>
-
         <div class="confirm-btn">
           <button class="admin-button-com big blue" formType="submit">
             提交
@@ -20,12 +21,10 @@
     </div>
   </div>
 </template>
-
 <script>
-import TuiListCell from "@/components/plugin/list-cell";
-import AppAvatarModule from "@/components/module/app-avatar";
-const form = require("@/utils/formValidation.js");
-import { getLb,addCloudLb } from "@/api/shop";
+import TuiListCell from "@/components/plugin/list-cell"
+import AppAvatarModule from "@/components/module/app-avatar"
+import { getLb,addCloudLb } from "@/api/shop"
 export default {
   name: "makeTrumpet",
   components: {
@@ -35,7 +34,8 @@ export default {
   data() {
     return {
       form: {
-        makeLbSn: ""
+        makeLbSn: "",
+        makeLbVersion:0
       }
     };
   },
@@ -43,11 +43,10 @@ export default {
   },
   methods: {
     async init() {
-      try {
         const { data } = await getLb();
         this.form.makeLbSn = data.makeLbSn;
-        this.$forceUpdate();
-      } finally {}
+        this.form.makeLbVersion = data.makeLbVersion
+        this.$forceUpdate()
     },
     confirmFn() {
       addCloudLb(this.form).then((res) => {
@@ -60,13 +59,6 @@ export default {
       });
     },
     formSubmit(e) {
-      let rules = [
-        {
-          name: "makeLbSn",
-          rule: ["required"],
-          msg: ["请填写编号"],
-        }
-      ]
       this.confirmFn();
     },
   },

hdApp/src/admin/shop/mtTrumpet.vue

@@ -3,14 +3,15 @@
     <div>
       <form @submit="formSubmit">
         <div class="module-com input-line-wrap">
-
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title">编号（SN）：</div>
             <input v-model="form.mtLbSn" placeholder-class="phcolor" class="tui-input" name="mtLbSn" placeholder="请填写编号" maxlength="50" type="number" />
           </tui-list-cell>
-
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">版本号：</div>
+            <input v-model="form.mtLbVersion" placeholder-class="phcolor" class="tui-input" name="mtLbVersion" placeholder="请填写版本号" maxlength="50" type="number" />
+          </tui-list-cell>
         </div>
-
         <div class="confirm-btn">
           <button class="admin-button-com big blue" formType="submit">
             提交
@@ -24,7 +25,6 @@
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 import AppAvatarModule from "@/components/module/app-avatar";
-const form = require("@/utils/formValidation.js");
 import { getLb,addCloudLb } from "@/api/shop";
 export default {
   name: "mtTrumpet",
@@ -35,17 +35,17 @@ export default {
   data() {
     return {
       form: {
-        mtLbSn: ""
+        mtLbSn: "",
+        mtLbVersion:0
       }
     };
   },
   methods: {
     async init() {
-      try {
-        const { data } = await getLb();
-        this.form.mtLbSn = data.mtLbSn;
-        this.$forceUpdate();
-      } finally {}
+        const { data } = await getLb()
+        this.form.mtLbSn = data.mtLbSn
+        this.form.mtLbVersion = data.mtLbVersion
+        this.$forceUpdate()
     },
     confirmFn() {
       addCloudLb(this.form).then((res) => {
@@ -58,14 +58,7 @@ export default {
       });
     },
     formSubmit(e) {
-      let rules = [
-        {
-          name: "mtLbSn",
-          rule: ["required"],
-          msg: ["请填写编号"],
-        }
-      ]
-      this.confirmFn();
+      this.confirmFn()
     },
   },
 };

hdApp/src/admin/shop/trumpet.vue

@@ -3,28 +3,25 @@
     <div>
       <form @submit="formSubmit">
         <div class="module-com input-line-wrap">
-
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title">编号（SN）：</div>
             <input v-model="form.lbSn" placeholder-class="phcolor" class="tui-input" name="lbSn" placeholder="请填写编号" maxlength="50" type="number" />
           </tui-list-cell>
-
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">版本号：</div>
+            <input v-model="form.lbVersion" placeholder-class="phcolor" class="tui-input" name="lbVersion" placeholder="请填写版本号" maxlength="50" type="number" />
+          </tui-list-cell>
         </div>
-
         <div class="confirm-btn">
-          <button class="admin-button-com big blue" formType="submit">
-            提交
-          </button>
+          <button class="admin-button-com big blue" formType="submit"> 提交 </button>
         </div>
       </form>
     </div>
   </div>
 </template>
-
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 import AppAvatarModule from "@/components/module/app-avatar";
-const form = require("@/utils/formValidation.js");
 import { getLb,addCloudLb } from "@/api/shop";
 export default {
   name: "trumpet",
@@ -35,17 +32,17 @@ export default {
   data() {
     return {
       form: {
-        lbSn: ""
+        lbSn: "",
+        lbVersion:0
       }
     };
   },
   methods: {
     async init() {
-      try {
         const { data } = await getLb();
-        this.form.lbSn = data.lbSn;
+        this.form.lbSn = data.lbSn
+        this.form.lbVersion = data.lbVersion
         this.$forceUpdate();
-      } finally {}
     },
     confirmFn() {
       addCloudLb(this.form).then((res) => {
@@ -58,19 +55,11 @@ export default {
       });
     },
     formSubmit(e) {
-      let rules = [
-        {
-          name: "lbSn",
-          rule: ["required"],
-          msg: ["请填写编号"],
-        }
-      ]
       this.confirmFn();
     },
   },
 };
 </script>
-
 <style lang="scss" scoped>
 .app-content {
   min-height: calc(100vh - 20upx);

hdApp/src/api/shop/index.js

@@ -12,12 +12,12 @@ export const getRegion = data => {
 	return https.get('/shop/region', data)
 }
 
-//添加云喇叭
+//添加云音箱
 export const addCloudLb = data => {
 	return https.get('/shop-ext/add-lb', data)
 }
 
-//获取云喇叭信息
+//获取云音箱信息
 export const getLb = data => {
 	return https.get('/shop-ext/get-lb', data)
 }

hdApp/src/pages.json

@@ -186,9 +186,9 @@
 				{"path": "mtPrint","style": {"navigationBarTitleText": "美团小票机"}},
 				{"path": "makePrint","style": {"navigationBarTitleText": "操作台小票机"}},
 				{"path": "password","style": {"navigationBarTitleText": "修改密码"}},
-				{"path": "trumpet","style": {"navigationBarTitleText": "前台云喇叭"}},
-				{"path": "makeTrumpet","style": {"navigationBarTitleText": "操作台云喇叭"}},
-				{"path": "mtTrumpet","style": {"navigationBarTitleText": "美团云喇叭"}}
+				{"path": "trumpet","style": {"navigationBarTitleText": "前台云音箱"}},
+				{"path": "makeTrumpet","style": {"navigationBarTitleText": "操作台云音箱"}},
+				{"path": "mtTrumpet","style": {"navigationBarTitleText": "美团云音箱"}}
 			]
 		},
 		{