显示内容优化

ghsPad/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'store'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
+export const APIHOST = 'http://api.shop.hzghd.com'
+export const IMGHOST = 'http://img.hzghd.com'
 export const CURRENT_ENV = 'dev'

ghsPad/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
+    "apiHost": "http://api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
+    "imgHost": "http://img.hzghd.com",
     "name":"花掌柜"
   }
 }

ghsPad/src/pages/home/components/leftArea.vue

@@ -1,6 +1,9 @@
 <template>
     <view class="itemList-box">
-        <view class="title">列表</view>
+        <view class="title">
+            列表
+            <text style="float:right;">{{ getMyShopInfo.shopName=='首店'? getMyShopInfo.merchantName: getMyShopInfo.merchantName+' '+getMyShopInfo.shopName}}</text>
+        </view>
         <view class="itemList-item_box">
             <view v-for="item in selectList" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="popAddModelFn(item)">
@@ -40,6 +43,7 @@
 <script>
 import productMins from "@/mixins/product";
 import selectNumPrice from './selectNumPrice.vue'
+import { mapGetters } from "vuex";
 export default {
     name:'leftItem',
     components:{selectNumPrice},
@@ -60,6 +64,9 @@ export default {
             itemList:[]
         }
     },
+	computed:{
+		...mapGetters(["getMyShopInfo"]),
+	},
     watch:{
         changeCurrentJobType:{
             handler(id){

ghsPad/src/pages/home/components/leftGroup.vue

@@ -1,6 +1,9 @@
 <template>
     <view class="itemList-box">
-        <view class="title">列表</view>
+        <view class="title">
+            列表
+            <text style="float:right;">{{ getMyShopInfo.shopName=='首店'? getMyShopInfo.merchantName: getMyShopInfo.merchantName+' '+getMyShopInfo.shopName}}</text>
+        </view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
             <view v-for="item in list.data" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="getDetail(item)">
@@ -28,6 +31,7 @@
     </view>
 </template>
 <script>
+import { mapGetters } from "vuex";
 import settlePop from './settlePop'
 import toPayWay from './toPay'
 import { list } from "@/mixins"
@@ -56,6 +60,9 @@ export default {
             price:0
         }
     },
+	computed:{
+		...mapGetters(["getMyShopInfo"]),
+	},
     watch:{
         customId:{
             handler(newCustomId){

ghsPad/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

hdPad/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'
 export const CURRENT_ENV = 'dev'

hdPad/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
+    "imgHost": "http://img.huaml.com",
     "name":"花美玲"
   }
 }

hdPad/src/pages/home/components/leftArea.vue

@@ -1,6 +1,9 @@
 <template>
     <view class="itemList-box">
-        <view class="title">列表</view>
+        <view class="title">
+            列表
+            <text style="float:right;">{{ getMyShopInfo.shopName=='首店'? getMyShopInfo.merchantName: getMyShopInfo.merchantName+' '+getMyShopInfo.shopName}}</text>
+        </view>
         <view class="itemList-item_box">
             <view v-for="item in selectList" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="popAddModelFn(item)">
@@ -38,6 +41,7 @@
     </view>
 </template>
 <script>
+import { mapGetters } from "vuex";
 import productMins from "@/mixins/product";
 import selectNumPrice from './selectNumPrice.vue'
 export default {
@@ -74,6 +78,9 @@ export default {
             immediate:true
         }
     },
+	computed:{
+		...mapGetters(["getMyShopInfo"]),
+	},
     methods:{
 		popAddModelFn(info) {
             let currentNum = info.currentNum

hdPad/src/pages/home/components/leftGroup.vue

@@ -1,6 +1,9 @@
 <template>
     <view class="itemList-box">
-        <view class="title">列表</view>
+        <view class="title">
+            列表
+            <text style="float:right;">{{ getMyShopInfo.shopName=='首店'? getMyShopInfo.merchantName: getMyShopInfo.merchantName+' '+getMyShopInfo.shopName}}</text>
+        </view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
             <view v-for="item in list.data" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="getDetail(item)">
@@ -28,6 +31,7 @@
     </view>
 </template>
 <script>
+import { mapGetters } from "vuex";
 import settlePop from './settlePop'
 import toPayWay from './toPay'
 import {getGroupList,detail,del} from "@/api/group"
@@ -65,6 +69,9 @@ export default {
             immediate:true
         }
     },
+	computed:{
+		...mapGetters(["getMyShopInfo"]),
+	},
     created(){
         this.getGroupList()
     },

hdPad/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {