merchantName name 变更

ghs/dist/shop/js/chunk-2d0bd265.0944d0be.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0bd265"],{"2b87":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad}})],1)},l=[],r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,a=e.ctx,n=e.app;this.app=n;var l=function(){return t.$service.sassShop.buyList()};a.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"merchantName",label:"花店名称",align:"center"},{prop:"userName",label:"店长",align:"center"},{prop:"mobile",label:"手机号",align:"center"},{prop:"prePrice",label:"付款金额",align:"center",emptyText:"无"},{prop:"createTime",label:"付款时间",align:"center",emptyText:"无"},{prop:"updateTime",label:"到期时间",align:"center",emptyText:"无"},{prop:"setName",label:"套餐",align:"center",emptyText:"无"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),n.refresh()}}},p=r,i=a("5d22"),o=Object(i["a"])(p,n,l,!1,null,null,null);t["default"]=o.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0bd265"],{"2b87":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad}})],1)},l=[],r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,a=e.ctx,n=e.app;this.app=n;var l=function(){return t.$service.sassShop.buyList()};a.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"name",label:"花店名称",align:"center"},{prop:"userName",label:"店长",align:"center"},{prop:"mobile",label:"手机号",align:"center"},{prop:"prePrice",label:"付款金额",align:"center",emptyText:"无"},{prop:"createTime",label:"付款时间",align:"center",emptyText:"无"},{prop:"updateTime",label:"到期时间",align:"center",emptyText:"无"},{prop:"setName",label:"套餐",align:"center",emptyText:"无"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),n.refresh()}}},p=r,i=a("5d22"),o=Object(i["a"])(p,n,l,!1,null,null,null);t["default"]=o.exports}}]);

ghs/dist/shop/js/chunk-2d0c1f57.6c536d5b.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c1f57"],{"47ec":function(e,t,n){"use strict";n.r(t);var o=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,o.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,o.row)}}},[e._v("查看")])]}}])})],1)},a=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,o=e.app;this.app=o;var a=function(){return t.$service.sassShop.shopList()};n.service({page:a}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"merchantName",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),o.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.shop.".concat(Object(l["getFirstHost"])()),o=null;switch(e){case 1:o="/user/gathering-code?id=".concat(t.id);break;case 2:o="/user/apply-code?id=".concat(t.id);break}window.open(n+o)}}},c=r,p=n("5d22"),i=Object(p["a"])(c,o,a,!1,null,null,null);t["default"]=i.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c1f57"],{"47ec":function(e,t,n){"use strict";n.r(t);var o=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,o.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,o.row)}}},[e._v("查看")])]}}])})],1)},a=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,o=e.app;this.app=o;var a=function(){return t.$service.sassShop.shopList()};n.service({page:a}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"name",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),o.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.shop.".concat(Object(l["getFirstHost"])()),o=null;switch(e){case 1:o="/user/gathering-code?id=".concat(t.id);break;case 2:o="/user/apply-code?id=".concat(t.id);break}window.open(n+o)}}},c=r,p=n("5d22"),i=Object(p["a"])(c,o,a,!1,null,null,null);t["default"]=i.exports}}]);

ghs/src/pages/layout/topbar/index.vue

@@ -3,7 +3,7 @@
 		<div class="collapse">
 			<img class="avatar" :src="logoUrl | default_avatar" alt="花卉宝" />
 			<div>
-				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.merchantName }}</span> -->
+				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.name }}</span> -->
 				<!-- <span v-else>花卉宝</span> -->
 				<!-- <span class="app-size-32 app-bold"> - </span> -->
 				<span>后台管理系统</span>

ghs/src/sass/goods/list.vue

@@ -131,7 +131,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center'
 						},

ghs/src/sass/member/list.vue

@@ -103,7 +103,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center',
 							emptyText: '无'

ghs/src/sass/pt-member/list.vue

@@ -103,7 +103,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center',
 							emptyText: '无'

ghs/src/sass/shop/buy.vue

@@ -31,7 +31,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '花店名称',
 							align: 'center'
 						},

ghs/src/sass/shop/list.vue

@@ -180,7 +180,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '名称',
 							align: 'center'
 						},

ghs/src/sass/shop/shop.vue

@@ -47,7 +47,7 @@
                                 align: 'center'
                             },
                             {
-                                prop: 'merchantName',
+                                prop: 'name',
                                 label: '商家',
                                 align: 'center'
                             },

ghs/src/views/my-invite/index.vue

@@ -10,7 +10,7 @@
 					></cl-avatar>
 				</div>
 				<div class="avatar-wrap-right">
-					<div class="app-size-32 avatar-name">{{ shopInfo.merchantName }}</div>
+					<div class="app-size-32 avatar-name">{{ shopInfo.name }}</div>
 					<el-tag size="mini">普通代理</el-tag>
 				</div>
 			</div>

ghs/src/views/order/components/sel-order.vue

@@ -678,7 +678,7 @@ export default {
 				);
 				LODOP.SET_PRINT_STYLE('FontSize', 20);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.merchantName}配送单`);
+				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.name}配送单`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
 				LODOP.ADD_PRINT_TEXT(160, 500, 100, 20, `No ${this.deliver.data.sendNum}`);

ghs/src/views/setting/wx-menu.vue

@@ -7,7 +7,7 @@
 					<div class="bar-img">
 						<img src="../../assets/images/setting/wx-bar-bg.png" alt />
 					</div>
-					<div class="bar-text">{{ shopInfo.merchantName }}</div>
+					<div class="bar-text">{{ shopInfo.name }}</div>
 				</div>
 				<!-- 中间快 -->
 				<div class="wx-content" @click="closeOptionFn"></div>

ghsApp/src/admin/billing/affirm.vue

@@ -151,12 +151,12 @@ export default {
 		if (!this.getMerchantInfo) {
 			this.initMerchantInfo().then(data => {
 				uni.setNavigationBarTitle({
-					title: data.merchantName
+					title: data.name
 				});
 			});
 		} else {
 			uni.setNavigationBarTitle({
-				title: this.getMerchantInfo.merchantName
+				title: this.getMerchantInfo.name
 			});
 		}
 	},

ghsApp/src/admin/home/workbench.vue

@@ -307,7 +307,7 @@ export default {
 		init() {
 			getUser().then(res => {
 				uni.setNavigationBarTitle({
-					title: res.merchantName
+					title: res.name
 				});
 
 				let nowTime = getDataTimestamp(new Date(), true);

ghsApp/src/admin/setting/wx-menu.vue

@@ -6,7 +6,7 @@
 				<div class="bar-img">
 					<img :src="`${constant.imgUrl}/retail/setting/wx-bar-bg.png`" alt="">
 				</div>
-				<div class="bar-text">{{userInfo.merchantName}}</div>
+				<div class="bar-text">{{userInfo.name}}</div>
 			</div>
 			<!-- 中间快 -->
 			<div class="wx-content" @click="menuCancelFn"></div>

ghsApp/src/ext-production.json

@@ -6,6 +6,6 @@
       "account": 12358,
       "apiHost": "https://api.shop.huahb.com",
       "imgHost": "https://img.huahb.com",
-      "merchantName":"销花宝（待申请）"
+      "name":"销花宝（待申请）"
     }
   }

ghsApp/src/ext.json

@@ -6,6 +6,6 @@
     "account": 0,
     "apiHost": "http://api.shop.hzghd.com",
     "imgHost": "https://img.hzghd.com",
-    "merchantName":"花掌柜"
+    "name":"花掌柜"
   }
 }

ghsApp/src/pagesClient/official/apply.vue

@@ -103,7 +103,7 @@
         <div class="recommend-det">
           <image style="width:90rpx;height:90rpx;border-radius:42rpx;" mode="scaleToFill" :src="merchantData.smallLogoUrl" @error="imageError" />
           <div class="recommend-info">
-            <div class="app-size-32">{{ merchantData.merchantName }}</div>
+            <div class="app-size-32">{{ merchantData.name }}</div>
             <div class="app-color-2">{{ merchantData.fullAddress }}</div>
           </div>
         </div>

ghsApp/src/pagesInvite/list.vue

@@ -4,7 +4,7 @@
 			<view class="info-main">
 				<app-avatar-module :width="100" />
 				<view class="content">
-					<view class="name"> {{ userInfo.merchantName || "" }}</view>
+					<view class="name"> {{ userInfo.name || "" }}</view>
 					<view class="mark"> 普通代理 </view>
 				</view>
 				<button class="user-wrap-right" @tap="toProcedure">

ghsApp/src/pagesOrder/shipInfo.vue

@@ -83,12 +83,12 @@ export default {
 		if (!this.getMerchantInfo) {
 			this.initMerchantInfo().then(data => {
 				uni.setNavigationBarTitle({
-					title: data.merchantName
+					title: data.name
 				});
 			});
 		} else {
 			uni.setNavigationBarTitle({
-				title: this.getMerchantInfo.merchantName
+				title: this.getMerchantInfo.name
 			});
 		}
 	},

ghsApp/src/pagesShare/pay.vue

@@ -168,7 +168,7 @@ export default {
       getOrderShop().then(res => {
       //   this.inpFocus = true;
         uni.setNavigationBarTitle({
-          title: `您正在向【${res.shop.merchantName}】付款`
+          title: `您正在向【${res.shop.name}】付款`
         });
         //没有登陆不取优惠
         // if (isLogin()) {

hd/dist/shop/js/chunk-2d0bd265.0944d0be.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0bd265"],{"2b87":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad}})],1)},l=[],r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,a=e.ctx,n=e.app;this.app=n;var l=function(){return t.$service.sassShop.buyList()};a.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"merchantName",label:"花店名称",align:"center"},{prop:"userName",label:"店长",align:"center"},{prop:"mobile",label:"手机号",align:"center"},{prop:"prePrice",label:"付款金额",align:"center",emptyText:"无"},{prop:"createTime",label:"付款时间",align:"center",emptyText:"无"},{prop:"updateTime",label:"到期时间",align:"center",emptyText:"无"},{prop:"setName",label:"套餐",align:"center",emptyText:"无"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),n.refresh()}}},p=r,i=a("5d22"),o=Object(i["a"])(p,n,l,!1,null,null,null);t["default"]=o.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0bd265"],{"2b87":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad}})],1)},l=[],r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,a=e.ctx,n=e.app;this.app=n;var l=function(){return t.$service.sassShop.buyList()};a.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"name",label:"花店名称",align:"center"},{prop:"userName",label:"店长",align:"center"},{prop:"mobile",label:"手机号",align:"center"},{prop:"prePrice",label:"付款金额",align:"center",emptyText:"无"},{prop:"createTime",label:"付款时间",align:"center",emptyText:"无"},{prop:"updateTime",label:"到期时间",align:"center",emptyText:"无"},{prop:"setName",label:"套餐",align:"center",emptyText:"无"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),n.refresh()}}},p=r,i=a("5d22"),o=Object(i["a"])(p,n,l,!1,null,null,null);t["default"]=o.exports}}]);

hd/dist/shop/js/chunk-2d0c1f57.d610db4f.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c1f57"],{"47ec":function(e,t,n){"use strict";n.r(t);var o=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,o.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,o.row)}}},[e._v("查看")])]}}])})],1)},a=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,o=e.app;this.app=o;var a=function(){return t.$service.sassShop.shopList()};n.service({page:a}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"merchantName",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),o.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.s.".concat(Object(l["getFirstHost"])(),".com"),o=null;switch(e){case 1:o="/user/gathering-code?id=".concat(t.id);break;case 2:o="/user/apply-code?id=".concat(t.id);break}window.open(n+o)}}},c=r,i=n("5d22"),p=Object(i["a"])(c,o,a,!1,null,null,null);t["default"]=p.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c1f57"],{"47ec":function(e,t,n){"use strict";n.r(t);var o=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,o.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,o.row)}}},[e._v("查看")])]}}])})],1)},a=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,o=e.app;this.app=o;var a=function(){return t.$service.sassShop.shopList()};n.service({page:a}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"name",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),o.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.s.".concat(Object(l["getFirstHost"])(),".com"),o=null;switch(e){case 1:o="/user/gathering-code?id=".concat(t.id);break;case 2:o="/user/apply-code?id=".concat(t.id);break}window.open(n+o)}}},c=r,i=n("5d22"),p=Object(i["a"])(c,o,a,!1,null,null,null);t["default"]=p.exports}}]);

hd/src/pages/layout/topbar/index.vue

@@ -3,7 +3,7 @@
 		<div class="collapse">
 			<img class="avatar" :src="logoUrl | default_avatar" alt="" />
 			<div>
-				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.merchantName }}</span> -->
+				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.name }}</span> -->
 				<!-- <span v-else>花卉宝</span> -->
 				<!-- <span class="app-size-32 app-bold"> - </span> -->
 				<span>后台管理系统</span>

hd/src/sass/goods/list.vue

@@ -131,7 +131,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center'
 						},

hd/src/sass/member/list.vue

@@ -103,7 +103,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center',
 							emptyText: '无'

hd/src/sass/pt-member/list.vue

@@ -103,7 +103,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center',
 							emptyText: '无'

hd/src/sass/shop/buy.vue

@@ -31,7 +31,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '花店名称',
 							align: 'center'
 						},

hd/src/sass/shop/list.vue

@@ -180,7 +180,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '名称',
 							align: 'center'
 						},

hd/src/sass/shop/shop.vue

@@ -47,7 +47,7 @@
                                 align: 'center'
                             },
                             {
-                                prop: 'merchantName',
+                                prop: 'name',
                                 label: '商家',
                                 align: 'center'
                             },

hd/src/views/member/list.vue

@@ -2,7 +2,12 @@
 	<div class="app-list-content">
 		<x-crud class="liu-crud-wrap" @load="onLoad">
 			<template #slot-tabs="{ scope }">
-				<el-tabs class="liu-tabs" type="border-card" v-model="tabIndex" @tab-click="handleClick">
+				<el-tabs
+					class="liu-tabs"
+					type="border-card"
+					v-model="tabIndex"
+					@tab-click="handleClick"
+				>
 					<el-tab-pane
 						v-for="(item, index) in tabsData"
 						:key="index"
@@ -12,56 +17,66 @@
 				</el-tabs>
 			</template>
 
-			<template #table-column-avatarUrl="{scope}">
-				<cl-avatar :size="22" :src="scope.row.smallAvatarUrl" :style="{ margin: 'auto' }"></cl-avatar>
+			<template #table-column-avatarUrl="{ scope }">
+				<cl-avatar
+					:size="22"
+					:src="scope.row.smallAvatarUrl"
+					:style="{ margin: 'auto' }"
+				></cl-avatar>
 			</template>
 
-			<template #table-column-id="{scope}">
+			<template #table-column-id="{ scope }">
 				<el-link
 					:underline="true"
 					@click="detailShowFn(scope.row)"
-					style="font-size:12px;"
-				>{{ scope.row.id }}</el-link>
+					style="font-size: 12px"
+					>{{ scope.row.id }}</el-link
+				>
 			</template>
 
-			<template #table-column-mobile="{scope}">
+			<template #table-column-mobile="{ scope }">
 				<span v-if="scope.row.mobile != ''">{{ scope.row.mobile }}</span>
 				<span v-else>-</span>
 			</template>
 
-			<template #table-column-userName="{scope}">
+			<template #table-column-userName="{ scope }">
 				<el-link
 					:underline="true"
 					@click="detailShowFn(scope.row)"
-					style="font-size:12px;"
-				>{{ scope.row.userName }}</el-link>
+					style="font-size: 12px"
+					>{{ scope.row.userName }}</el-link
+				>
 			</template>
 
-			<template #table-column-balance="{scope}">
+			<template #table-column-balance="{ scope }">
 				<span>{{ scope.row.userAsset.balance }}</span>
 			</template>
 
-			<template #table-column-growth="{scope}">
+			<template #table-column-growth="{ scope }">
 				<span>{{ scope.row.userAsset.growth }}</span>
 			</template>
 
-			<template #table-column-subscribe="{scope}">
+			<template #table-column-subscribe="{ scope }">
 				<i
 					class="el-icon-success"
 					v-if="scope.row.subscribe == 1"
-					style="color:#67C23A;font-size:19px;"
+					style="color: #67c23a; font-size: 19px"
 				></i>
-				<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
+				<i class="el-icon-success" v-else style="color: #c0c4cc; font-size: 19px"></i>
 			</template>
 
-			<template #table-column-store="{scope}">
+			<template #table-column-store="{ scope }">
 				<div class="store-icon">
-					<i class="el-icon-s-shop" v-if="scope.row.store == 1" style="color:#67C23A"></i>
-					<i class="el-icon-s-shop" v-else style="color:#C0C4CC"></i>
+					<i
+						class="el-icon-s-shop"
+						v-if="scope.row.store == 1"
+						style="color: #67c23a"
+					></i>
+					<i class="el-icon-s-shop" v-else style="color: #c0c4cc"></i>
 				</div>
 			</template>
 
-			<template #table-column-sourceType="{scope}">
+			<template #table-column-sourceType="{ scope }">
 				<span v-if="scope.row.sourceType == 0">微信</span>
 				<span v-else-if="scope.row.sourceType == 1">支付宝</span>
 				<span v-else-if="scope.row.sourceType == 2">小程序</span>
@@ -71,34 +86,49 @@
 				<span v-else></span>
 			</template>
 
-			<template #table-column-memberLevel="{scope}">
+			<template #table-column-memberLevel="{ scope }">
 				<template v-if="scope.row.userAsset.member == 0">
 					<template v-if="scope.row.mobile == ''">
-						<el-tag size="mini" v-if="scope.row.userAsset.member == 0" type="info">普</el-tag>
+						<el-tag size="mini" v-if="scope.row.userAsset.member == 0" type="info"
+							>普</el-tag
+						>
 					</template>
 					<template v-else>
-						<el-tag size="mini" v-if="scope.row.userAsset.member == 0" type="success">会员</el-tag>
+						<el-tag size="mini" v-if="scope.row.userAsset.member == 0" type="success"
+							>会员</el-tag
+						>
 					</template>
 				</template>
 				<el-tag size="small" v-else>{{ scope.row.userAsset.member }}</el-tag>
 			</template>
 
-			<template #table-column-discount="{scope}">
-				<template v-if="scope.row.userAsset.discount < 1">{{scope.row.userAsset.discount}}</template>
+			<template #table-column-discount="{ scope }">
+				<template v-if="scope.row.userAsset.discount < 1">{{
+					scope.row.userAsset.discount
+				}}</template>
 				<template v-else>-</template>
 			</template>
 
 			<!-- 充值 -->
-			<template #slot-recharge="{scope}">
-				<el-button type="text" size="mini" @click="rechargeShowFn(scope.row)">充值</el-button>
+			<template #slot-recharge="{ scope }">
+				<el-button type="text" size="mini" @click="rechargeShowFn(scope.row)"
+					>充值</el-button
+				>
 			</template>
 			<!-- 升级 -->
-			<template #slot-upgrade="{scope}">
-				<el-button type="text" size="mini" @click="upgradeShowFn(scope.row)">升级</el-button>
+			<template #slot-upgrade="{ scope }">
+				<el-button type="text" size="mini" @click="upgradeShowFn(scope.row)"
+					>升级</el-button
+				>
 			</template>
 		</x-crud>
 		<!-- 充值 -->
-		<el-dialog title="充值" :visible.sync="rechargeDialog" :close-on-click-modal="false" width="600px">
+		<el-dialog
+			title="充值"
+			:visible.sync="rechargeDialog"
+			:close-on-click-modal="false"
+			width="600px"
+		>
 			<div class="recharge-modal-content">
 				<div class="card-name">
 					<cardName :data="modalData" />
@@ -136,7 +166,12 @@
 			</div>
 		</el-dialog>
 		<!-- 升级 -->
-		<el-dialog title="升级" :visible.sync="upgradeDialog" :close-on-click-modal="false" width="600px">
+		<el-dialog
+			title="升级"
+			:visible.sync="upgradeDialog"
+			:close-on-click-modal="false"
+			width="600px"
+		>
 			<div class="recharge-modal-content">
 				<div class="card-name">
 					<cardName :data="modalData" />
@@ -150,7 +185,11 @@
 						class="demo-form"
 					>
 						<el-form-item label="请选择等级">
-							<el-select v-model="upgradeForm.member" size="small" placeholder="请选择">
+							<el-select
+								v-model="upgradeForm.member"
+								size="small"
+								placeholder="请选择"
+							>
 								<el-option
 									v-for="(item, index) in levelData.list"
 									:key="index"
@@ -187,7 +226,7 @@ import detailDraw from './components/detail-draw';
 export default {
 	components: {
 		cardName,
-		detailDraw
+		detailDraw,
 	},
 	data() {
 		return {
@@ -198,18 +237,18 @@ export default {
 				{
 					text: '全部',
 					key: '-1',
-					val: 0
+					val: 0,
 				},
 				{
 					text: '粉丝',
 					key: '1',
-					val: 0
+					val: 0,
 				},
 				{
 					text: '会员',
 					key: '2',
-					val: 0
-				}
+					val: 0,
+				},
 			],
 			// modal
 			modalData: {},
@@ -217,22 +256,22 @@ export default {
 			rechargeDialog: false,
 			rechargeForm: {
 				rechargeAmount: '',
-				confirmPassword: ''
+				confirmPassword: '',
 			},
 			rechargeRules: {},
 			// upgrade
 			upgradeDialog: false,
 			upgradeForm: {
 				member: '',
-				confirmPassword: ''
+				confirmPassword: '',
 			},
 			upgradeRules: {},
 			// draw
-			drapShow: false
+			drapShow: false,
 		};
 	},
 	computed: {
-		...mapGetters({ levelData: 'level' })
+		...mapGetters({ levelData: 'level' }),
 	},
 	created() {
 		this.getLevel();
@@ -249,9 +288,9 @@ export default {
 			this.$service.member
 				.recharge({
 					userId: this.modalData.id,
-					...this.rechargeForm
+					...this.rechargeForm,
 				})
-				.then(res => {
+				.then((res) => {
 					console.log(res);
 					this.$message.success('充值成功！');
 					this.resetForm();
@@ -262,9 +301,9 @@ export default {
 			this.$service.member
 				.upgrade({
 					userId: this.modalData.id,
-					...this.upgradeForm
+					...this.upgradeForm,
 				})
-				.then(res => {
+				.then((res) => {
 					this.$message.success('升级成功！');
 					console.log(res);
 					this.resetForm();
@@ -311,71 +350,71 @@ export default {
 							prop: 'id',
 							label: 'ID',
 							align: 'center',
-							width: 100
+							width: 100,
 						},
 						{
 							prop: 'avatarUrl',
 							label: '头像',
 							align: 'center',
-							width: 80
+							width: 80,
 						},
 						{
 							prop: 'userName',
 							label: '昵称',
-							align: 'center'
+							align: 'center',
 						},
 						{
 							prop: 'mobile',
 							label: '手机号',
 							align: 'center',
-							width: 120
+							width: 120,
 						},
 						{
 							prop: 'memberLevel',
 							label: '会员级别',
 							align: 'center',
-							emptyText: '无'
+							emptyText: '无',
 						},
 						{
 							prop: 'growth',
 							label: '成长值',
-							align: 'center'
+							align: 'center',
 						},
 						{
 							prop: 'discount',
 							label: '折扣',
-							align: 'center'
+							align: 'center',
 						},
 						{
 							prop: 'balance',
 							label: '余额',
-							align: 'center'
+							align: 'center',
 						},
 						{
 							prop: 'subscribe',
 							label: '粉丝',
 							align: 'center',
 							sortable: false,
-							width: 150
+							width: 150,
 						},
 						{
 							prop: 'store',
 							label: '已到店',
 							align: 'center',
-							width: 100
+							width: 100,
 						},
 						{
 							prop: 'sourceType',
 							label: '来源',
 							align: 'center',
-							width: 100
+							width: 100,
 						},
 						{
 							prop: 'visitTimeFormat',
 							label: '最近访问',
 							align: 'center',
-							width: 140
-						}
+							width: 140,
+						},
 					],
 					// 操作列
 					op: {
@@ -385,16 +424,16 @@ export default {
 							width: 180,
 							align: 'center',
 							fixed: 'right',
-							label: '操作'
+							label: '操作',
 						},
 						// 布局，请移步 `layout`
-						layout: ['slot-detail', 'slot-recharge', 'slot-upgrade', 'slot-ship']
-					}
+						layout: ['slot-detail', 'slot-recharge', 'slot-upgrade', 'slot-ship'],
+					},
 				})
 				.set('upsert', {
 					props: {
 						width: '400px',
-						'label-width': '100px'
+						'label-width': '100px',
 					},
 
 					items: [
@@ -405,13 +444,13 @@ export default {
 							component: {
 								name: 'el-input',
 								attrs: {
-									placeholder: '请填写手机号'
-								}
+									placeholder: '请填写手机号',
+								},
 							},
 							rules: [
 								{
 									required: true,
-									message: '请填写手机号'
+									message: '请填写手机号',
 								},
 								{
 									validator: (rule, value, callback) => {
@@ -420,9 +459,9 @@ export default {
 										}
 
 										callback();
-									}
-								}
-							]
+									},
+								},
+							],
 						},
 						{
 							prop: 'confirmMobile',
@@ -431,13 +470,13 @@ export default {
 							component: {
 								name: 'el-input',
 								attrs: {
-									placeholder: '请填写'
-								}
+									placeholder: '请填写',
+								},
 							},
 							rules: [
 								{
 									required: true,
-									message: '请填写'
+									message: '请填写',
 								},
 								{
 									validator: (rule, value, callback) => {
@@ -446,9 +485,9 @@ export default {
 										}
 
 										callback();
-									}
-								}
-							]
+									},
+								},
+							],
 						},
 						{
 							prop: 'balance',
@@ -458,16 +497,16 @@ export default {
 								name: 'el-input-number',
 								props: {
 									min: 0,
-									max: 10000000
+									max: 10000000,
 								},
 								attrs: {
-									placeholder: '请填写余额'
-								}
+									placeholder: '请填写余额',
+								},
 							},
 							rules: {
 								required: true,
-								message: '请填写余额'
-							}
+								message: '请填写余额',
+							},
 						},
 						{
 							prop: 'memberLevel',
@@ -476,20 +515,20 @@ export default {
 							component: {
 								name: 'el-select',
 								attrs: {
-									placeholder: '请选择'
+									placeholder: '请选择',
 								},
 								options: this.$util.isEmpty(this.levelData)
 									? []
-									: this.levelData.list.map(e => {
+									: this.levelData.list.map((e) => {
 											e.label = e.level;
 											e.value = e.level;
 											return e;
-									  })
+									  }),
 							},
 							rules: {
 								required: true,
-								message: '等级不能为空'
-							}
+								message: '等级不能为空',
+							},
 						},
 						{
 							prop: 'realName',
@@ -498,9 +537,9 @@ export default {
 							component: {
 								name: 'el-input',
 								attrs: {
-									placeholder: '选填'
-								}
-							}
+									placeholder: '选填',
+								},
+							},
 						},
 						{
 							prop: 'confirmPassword',
@@ -509,24 +548,24 @@ export default {
 							component: {
 								name: 'el-input',
 								attrs: {
-									placeholder: '请填写您的确认密码'
+									placeholder: '请填写您的确认密码',
 								},
 								props: {
 									placeholder: '请填写您的确认密码',
-									type: 'password'
-								}
+									type: 'password',
+								},
 							},
 							rules: [
 								{
 									required: true,
-									message: '密码不能为空'
+									message: '密码不能为空',
 								},
 								{
 									min: 6,
 									max: 16,
-									message: '密码长度在6到16个字符'
-								}
-							]
+									message: '密码长度在6到16个字符',
+								},
+							],
 						},
 						{
 							prop: 'tips',
@@ -537,15 +576,15 @@ export default {
 										注册会员时会根据手机号识别客户，等级和余额自动同步到帐户里。
 									</span>
 								</div>
-							)
-						}
-					]
+							),
+						},
+					],
 				})
 				.set('layout', [
 					['slot-tabs'],
 					['search-key', 'flex1', 'add-btn', 'refresh-btn'],
 					['data-table'],
-					['flex1', 'pagination']
+					['flex1', 'pagination'],
 				])
 				.on('refresh', async (params, { next }) => {
 					// 继续执行刷新
@@ -557,8 +596,8 @@ export default {
 				})
 				.done();
 			app.refresh({ type: this.tabIndex });
-		}
-	}
+		},
+	},
 };
 </script>
 

hd/src/views/my-invite/index.vue

@@ -10,7 +10,7 @@
 					></cl-avatar>
 				</div>
 				<div class="avatar-wrap-right">
-					<div class="app-size-32 avatar-name">{{ shopInfo.merchantName }}</div>
+					<div class="app-size-32 avatar-name">{{ shopInfo.name }}</div>
 					<el-tag size="mini">普通代理</el-tag>
 				</div>
 			</div>

hd/src/views/order/components/sel-order.vue

@@ -678,7 +678,7 @@ export default {
 				);
 				LODOP.SET_PRINT_STYLE('FontSize', 20);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.merchantName}配送单`);
+				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.name}配送单`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
 				LODOP.ADD_PRINT_TEXT(160, 500, 100, 20, `No ${this.deliver.data.sendNum}`);

hd/src/views/setting/wx-menu.vue

@@ -7,7 +7,7 @@
 					<div class="bar-img">
 						<img src="../../assets/images/setting/wx-bar-bg.png" alt />
 					</div>
-					<div class="bar-text">{{ shopInfo.merchantName }}</div>
+					<div class="bar-text">{{ shopInfo.name }}</div>
 				</div>
 				<!-- 中间快 -->
 				<div class="wx-content" @click="closeOptionFn"></div>

hdApp/src/admin/billing/affirm.vue

@@ -151,12 +151,12 @@ export default {
 		if (!this.getMerchantInfo) {
 			this.initMerchantInfo().then(data => {
 				uni.setNavigationBarTitle({
-					title: data.merchantName
+					title: data.name
 				});
 			});
 		} else {
 			uni.setNavigationBarTitle({
-				title: this.getMerchantInfo.merchantName
+				title: this.getMerchantInfo.name
 			});
 		}
 	},

hdApp/src/admin/home/workbench.vue

@@ -307,7 +307,7 @@ export default {
 		init() {
 			getUser().then(res => {
 				uni.setNavigationBarTitle({
-					title: res.merchantName
+					title: res.name
 				});
 
 				let nowTime = getDataTimestamp(new Date(), true);

hdApp/src/admin/setting/wx-menu.vue

@@ -6,7 +6,7 @@
 				<div class="bar-img">
 					<img :src="`${constant.imgUrl}/retail/setting/wx-bar-bg.png`" alt="">
 				</div>
-				<div class="bar-text">{{userInfo.merchantName}}</div>
+				<div class="bar-text">{{userInfo.name}}</div>
 			</div>
 			<!-- 中间快 -->
 			<div class="wx-content" @click="menuCancelFn"></div>

hdApp/src/ext-production.json

@@ -6,6 +6,6 @@
     "account": 12358,
     "apiHost": "https://api.shop.huahb.com",
     "imgHost": "https://img.huahb.com",
-    "merchantName":"花卉宝"
+    "name":"花卉宝"
   }
 }

hdApp/src/ext.json

@@ -6,6 +6,6 @@
     "account": 12362,
     "apiHost": "http://api.shop.huaml.com",
     "imgHost": "https://img.huaml.com",
-    "merchantName":"花美玲"
+    "name":"花美玲"
   }
 }

hdApp/src/pagesClient/official/apply.vue

@@ -103,7 +103,7 @@
         <div class="recommend-det">
           <image style="width:90rpx;height:90rpx;border-radius:42rpx;" mode="scaleToFill" :src="merchantData.smallLogoUrl" @error="imageError" />
           <div class="recommend-info">
-            <div class="app-size-32">{{ merchantData.merchantName }}</div>
+            <div class="app-size-32">{{ merchantData.name }}</div>
             <div class="app-color-2">{{ merchantData.fullAddress }}</div>
           </div>
         </div>

hdApp/src/pagesInvite/list.vue

@@ -4,7 +4,7 @@
 			<view class="info-main">
 				<app-avatar-module :width="100" />
 				<view class="content">
-					<view class="name"> {{ userInfo.merchantName || "" }}</view>
+					<view class="name"> {{ userInfo.name || "" }}</view>
 					<view class="mark"> 普通代理 </view>
 				</view>
 				<button class="user-wrap-right" @tap="toProcedure">

hdApp/src/pagesOrder/shipInfo.vue

@@ -83,12 +83,12 @@ export default {
 		if (!this.getMerchantInfo) {
 			this.initMerchantInfo().then(data => {
 				uni.setNavigationBarTitle({
-					title: data.merchantName
+					title: data.name
 				});
 			});
 		} else {
 			uni.setNavigationBarTitle({
-				title: this.getMerchantInfo.merchantName
+				title: this.getMerchantInfo.name
 			});
 		}
 	},

hdApp/src/pagesShare/pay.vue

@@ -168,7 +168,7 @@ export default {
       getOrderShop().then(res => {
       //   this.inpFocus = true;
         uni.setNavigationBarTitle({
-          title: `您正在向【${res.shop.merchantName}】付款`
+          title: `您正在向【${res.shop.name}】付款`
         });
         //没有登陆不取优惠
         // if (isLogin()) {

hdAppBack/src/admin/home/workbench.vue

@@ -279,7 +279,7 @@ export default {
     init() {
       getUser().then(res => {
         uni.setNavigationBarTitle({
-          title: res.merchantName
+          title: res.name
         });
 
         let nowTime = getDataTimestamp(new Date(), true);

hdAppBack/src/admin/interest/my-invite.vue

@@ -6,7 +6,7 @@
           <div class="user-wrap-left">
             <app-avatar-module :width="100" />
             <div class="user-det">
-              <!-- <div class="user-name">{{ userInfo.merchantName }}</div> -->
+              <!-- <div class="user-name">{{ userInfo.name }}</div> -->
               <div class="app-color-3">三级代理</div>
             </div>
           </div>

hdAppBack/src/admin/official/apply.vue

@@ -65,7 +65,7 @@
         <div class="recommend-det">
           <image style="width:90rpx;height:90rpx;border-radius:42rpx;" mode="scaleToFill" :src="merchantData.smallLogoUrl" @error="imageError" />
           <div class="recommend-info">
-            <div class="app-size-32">{{ merchantData.merchantName }}</div>
+            <div class="app-size-32">{{ merchantData.name }}</div>
           </div>
         </div>
       </div>

hdAppBack/src/admin/setting/wx-menu.vue

@@ -6,7 +6,7 @@
 				<div class="bar-img">
 					<img :src="`${constant.imgUrl}/retail/setting/wx-bar-bg.png`" alt="">
 				</div>
-				<div class="bar-text">{{userInfo.merchantName}}</div>
+				<div class="bar-text">{{userInfo.name}}</div>
 			</div>
 			<!-- 中间快 -->
 			<div class="wx-content" @click="menuCancelFn"></div>

hdAppBack/src/ext-production.json

@@ -6,6 +6,6 @@
       "account": 12358,
       "apiHost": "https://api.shop.huahb.com",
       "imgHost": "https://img.huahb.com",
-      "merchantName":"花卉宝"
+      "name":"花卉宝"
     }
   }

hdAppBack/src/ext.json

@@ -6,6 +6,6 @@
     "account": 12362,
     "apiHost": "http://api.shop.huaml.com",
     "imgHost": "https://img.huaml.com",
-    "merchantName":"花美玲"
+    "name":"花美玲"
   }
 }

mallApp/src/ext-production.json

@@ -6,6 +6,6 @@
     "account": 12358,
     "apiHost": "https://api.mall.huahb.com",
     "imgHost": "https://img.huahb.com",
-    "merchantName":"国兰花尚"
+    "name":"国兰花尚"
   }
 }

mallApp/src/ext.json

@@ -6,6 +6,6 @@
     "account": 12358,
     "apiHost": "https://api.shop.theflorist.cn",
     "imgHost": "https://img.theflorist.cn",
-    "merchantName":"中花卉 account请填写门店id"
+    "name":"中花卉 account请填写门店id"
   }
 }

mallApp/src/pages/home/index.vue

@@ -48,7 +48,7 @@ export default {
     init() {
       getOrderShop().then(res => {
         uni.setNavigationBarTitle({
-          title: `${res.merchant.merchantName}`
+          title: `${res.merchant.name}`
         });
       });
       this._detail();
@@ -56,7 +56,7 @@ export default {
       getShopUser().then(res => {
         // 设置分享
         let shareParams = {
-          title: `${res.merchantName}`, // 分享标题
+          title: `${res.name}`, // 分享标题
           desc: "", // 分享内容
           imgUrl: '',
           // #ifdef H5

mallApp/src/pages/home/shop.vue

@@ -2,7 +2,7 @@
   <div class="app-main app-content">
     <app-swiper :list="ad" @detail="adDetailFn" />
     <div class="shop-wrap">
-      <div class="shop-tit">{{ shop.merchantName }}</div>
+      <div class="shop-tit">{{ shop.name }}</div>
       <div>{{ shop.introduction }}</div>
     </div>
     <div class="list-content">
@@ -109,7 +109,7 @@ export default {
       getShopUser().then(res => {
         // 设置分享
         let shareParams = {
-          title: `${res.merchantName}`, // 分享标题
+          title: `${res.name}`, // 分享标题
           desc: "这家店不错推荐给你", // 分享内容
           imgUrl: "",
           // #ifdef H5

mallApp/src/pages/interest/invite.vue

@@ -159,7 +159,7 @@ export default {
       getShopUser().then(res => {
         // 设置分享
         let shareParams = {
-          title: `${res.merchantName}`, // 分享标题
+          title: `${res.name}`, // 分享标题
           desc: "这家店不错推荐给你", // 分享内容
           imgUrl: res.smallAvatarUrl,
           // #ifdef H5

mallApp/src/pages/pay/index.vue

@@ -193,7 +193,7 @@ export default {
       getOrderShop().then(res => {
         this.inpFocus = true;
         uni.setNavigationBarTitle({
-          title: `您正在向【${res.shop.merchantName}】付款`
+          title: `您正在向【${res.shop.name}】付款`
         });
         //没有登陆不取优惠
         if (isLogin()) {

pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.efc51aef.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.efc51aef.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.3fd5fd2f.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.3fd5fd2f.js"></script></body></html>

pt/dist/web/js/chunk-2d0cbb24.d286c939.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cbb24"],{"4b88":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad}})],1)},l=[],r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,a=e.ctx,n=e.app;this.app=n;var l=function(){return t.$service.saasShop.buyList()};a.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"merchantName",label:"花店名称",align:"center"},{prop:"userName",label:"店长",align:"center"},{prop:"mobile",label:"手机号",align:"center"},{prop:"prePrice",label:"付款金额",align:"center",emptyText:"无"},{prop:"createTime",label:"付款时间",align:"center",emptyText:"无"},{prop:"updateTime",label:"到期时间",align:"center",emptyText:"无"},{prop:"setName",label:"套餐",align:"center",emptyText:"无"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),n.refresh()}}},p=r,i=a("5d22"),o=Object(i["a"])(p,n,l,!1,null,null,null);t["default"]=o.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cbb24"],{"4b88":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-list-content"},[a("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad}})],1)},l=[],r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,a=e.ctx,n=e.app;this.app=n;var l=function(){return t.$service.saasShop.buyList()};a.service({page:l}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"name",label:"花店名称",align:"center"},{prop:"userName",label:"店长",align:"center"},{prop:"mobile",label:"手机号",align:"center"},{prop:"prePrice",label:"付款金额",align:"center",emptyText:"无"},{prop:"createTime",label:"付款时间",align:"center",emptyText:"无"},{prop:"updateTime",label:"到期时间",align:"center",emptyText:"无"},{prop:"setName",label:"套餐",align:"center",emptyText:"无"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),n.refresh()}}},p=r,i=a("5d22"),o=Object(i["a"])(p,n,l,!1,null,null,null);t["default"]=o.exports}}]);

pt/dist/web/js/chunk-2d2385e5.3a6fbfc3.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2385e5"],{fea1:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,a.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,a.row)}}},[e._v("查看")])]}}])})],1)},o=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,a=e.app;this.app=a;var o=function(){return t.$service.saasShop.shopList()};n.service({page:o}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"merchantName",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),a.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.pt.".concat(Object(l["getFirstHost"])()),a=null;switch(e){case 1:a="/user/gathering-code?id=".concat(t.id);break;case 2:a="/user/apply-code?id=".concat(t.id);break}window.open(n+a)}}},c=r,p=n("5d22"),i=Object(p["a"])(c,a,o,!1,null,null,null);t["default"]=i.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2385e5"],{fea1:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,a.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,a.row)}}},[e._v("查看")])]}}])})],1)},o=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,a=e.app;this.app=a;var o=function(){return t.$service.saasShop.shopList()};n.service({page:o}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"name",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),a.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.pt.".concat(Object(l["getFirstHost"])()),a=null;switch(e){case 1:a="/user/gathering-code?id=".concat(t.id);break;case 2:a="/user/apply-code?id=".concat(t.id);break}window.open(n+a)}}},c=r,p=n("5d22"),i=Object(p["a"])(c,a,o,!1,null,null,null);t["default"]=i.exports}}]);

pt/src/pages/layout/topbar/index.vue

@@ -3,7 +3,7 @@
 		<div class="collapse">
 			<img class="avatar" :src="logoUrl | default_avatar" alt="商标" />
 			<div>
-				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.merchantName }}</span> -->
+				<!-- <span v-if="$projectName == 'business'">{{ shopInfo.name }}</span> -->
 				<!-- <span v-else>花卉宝</span> -->
 				<!-- <span class="app-size-32 app-bold"> - </span> -->
 				<span>后台管理系统</span>

pt/src/saas/goods/list.vue

@@ -131,7 +131,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center'
 						},

pt/src/saas/member/list.vue

@@ -103,7 +103,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center',
 							emptyText: '无'

pt/src/saas/pt-member/list.vue

@@ -103,7 +103,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '商家',
 							align: 'center',
 							emptyText: '无'

pt/src/saas/shop/buy.vue

@@ -31,7 +31,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '花店名称',
 							align: 'center'
 						},

pt/src/saas/shop/list.vue

@@ -16,35 +16,6 @@
 				<span>{{ scope.row.totalView }}</span>
 			</template>
 
-			<!-- 微信支付 -->
-			<template #table-column-wxPayInit="{scope}">
-
-			</template>
-			<!-- 支付宝支付 -->
-			<template #table-column-aliPayInit="{scope}">
-
-			</template>
-			<template #table-column-h5Mall="{scope}">
-				<el-button type="text" @click="getH5MallQrCode(scope.row.id)">查看</el-button>
-			</template>
-
-			<!-- 公众号 -->
-			<template #table-column-wxAppId="{scope}">
-
-			</template>
-			<template #table-column-expericeCode="{scope}">
-				<div class="pay on">
-					<el-button type="text" >查看</el-button>
-				</div>
-			</template>
-
-			<!-- 小程序 -->
-			<template #table-column-miniAppId="{scope}">
-				<div class="pay on">
-
-				</div>
-			</template>
-
 			<!-- 平台帐号激活 -->
 			<template #slot-activation="{scope}">
 				<div v-if="firstHost == 'huaml.com' || firstHost == 'huahb.com' ">
@@ -65,7 +36,7 @@
 			</template>
 
 			<template #slot-op-btn="{scope}">
-				<el-button size="mini" type="text" @click="logoutRow(scope.row)">注销</el-button>
+				<el-button size="mini" type="text" @click="relateGhs(scope.row)">找供货商</el-button>
 			</template>
 		</x-crud>
 		<!-- 微信支付 -->
@@ -168,7 +139,7 @@ export default {
 							align: 'center'
 						},
 						{
-							prop: 'merchantName',
+							prop: 'name',
 							label: '名称',
 							align: 'center'
 						},
@@ -193,48 +164,6 @@ export default {
 							label: '访问量',
 							align: 'center'
 						},
-						{
-							prop: 'wxPayInit',
-							label: '微信支付',
-							align: 'center',
-							'min-width': '100px'
-						},
-						{
-							prop: 'aliPayInit',
-							label: '支付宝支付',
-							align: 'center',
-							'min-width': '110px'
-						},
-						{
-							prop: 'h5Mall',
-							label: 'H5商城',
-							align: 'center',
-							'min-width': '100px'
-						},
-						{
-							prop: 'openAppId',
-							label: '平台',
-							align: 'center',
-							'min-width': '100px'
-						},
-						{
-							prop: 'wxAppId',
-							label: '公众号',
-							align: 'center',
-							'min-width': '100px'
-						},
-						{
-							prop: 'miniAppId',
-							label: '小程序',
-							align: 'center',
-							'min-width': '100px'
-						},
-						{
-							prop: 'expericeCode',
-							label: '体验码',
-							align: 'center',
-							'min-width': '100px'
-						},
 						{
 							prop: 'setName',
 							label: '套餐',
@@ -261,19 +190,6 @@ export default {
 			app.refresh();
 		},
 
-		logoutRow({ id }) {
-			this.$confirm('确认此商家的公众号和小程序已经取消授权？', '提示', {
-				type: 'warning'
-			}).then(() => {
-				this.$service.saasShop
-					.merchantCancel({ id })
-					.then(res => {
-						this.$message.success('注销成功');
-					})
-					.catch(() => {});
-			});
-		},
-
 		payOption(type, data) {
 			this.plamPayType = type;
 			console.log(type);

pt/src/saas/shop/shop.vue

@@ -47,7 +47,7 @@
                                 align: 'center'
                             },
                             {
-                                prop: 'merchantName',
+                                prop: 'name',
                                 label: '商家',
                                 align: 'center'
                             },

pt/src/views/my-invite/index.vue

@@ -10,7 +10,7 @@
 					></cl-avatar>
 				</div>
 				<div class="avatar-wrap-right">
-					<div class="app-size-32 avatar-name">{{ shopInfo.merchantName }}</div>
+					<div class="app-size-32 avatar-name">{{ shopInfo.name }}</div>
 					<div class="app-size-24">三级代理</div>
 				</div>
 			</div>

pt/src/views/order/components/sel-order.vue

@@ -857,7 +857,7 @@ export default {
 				);
 				LODOP.SET_PRINT_STYLE('FontSize', 20);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.merchantName}配送单`);
+				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.name}配送单`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
 				LODOP.ADD_PRINT_TEXT(160, 500, 100, 20, `No ${this.deliver.data.sendNum}`);

pt/src/views/setting/wx-menu.vue

@@ -7,7 +7,7 @@
 					<div class="bar-img">
 						<img src="../../assets/images/setting/wx-bar-bg.png" alt />
 					</div>
-					<div class="bar-text">{{ shopInfo.merchantName }}</div>
+					<div class="bar-text">{{ shopInfo.name }}</div>
 				</div>
 				<!-- 中间快 -->
 				<div class="wx-content" @click="closeOptionFn"></div>