供应商 名称

ghsApp/dist/build/mp-weixin/admin/ghs/shop.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "供货商",
+  "navigationBarTitleText": "供应商",
   "usingComponents": {
     "app-wrapper-empty": "/components/app-wrapper-empty"
   }

ghsApp/dist/build/mp-weixin/pagesClient/official/latest-shop.wxml

@@ -1 +1 @@
-<view class="latest-content_box data-v-4fd05aee"><view class="shop-title_box data-v-4fd05aee">您访问过的供货商</view><view class="shop-list_box data-v-4fd05aee"><block wx:if="{{!$root.g0}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__" wx:key="shopId"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/customerPlace'],['query',{shopId:item.shopId}]]]]]]]}}" bindtap="__e" class="data-v-4fd05aee"><app-avatar-module vue-id="{{'cb65cf00-1-'+__i0__}}" src="https://goss.cfp.cn/creative/vcg/800/new/VCG41N1210205351.jpg" width="{{120}}" class="data-v-4fd05aee" bind:__l="__l"></app-avatar-module><view class="tit data-v-4fd05aee">{{''+item.shopName+''}}</view></view></block></block><block wx:else><view class="_div data-v-4fd05aee">暂无数据</view></block></view><view class="app-footer data-v-4fd05aee"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/index?introMerchantId='+this.userInfo.id+'&form=2&style=2']]]]]]]}}" class="des data-v-4fd05aee" bindtap="__e">我是供货商，点此<text class="data-v-4fd05aee">申请开店</text><view class="iconfont iconxiangyou _i data-v-4fd05aee"></view></view></view></view>
+<view class="latest-content_box data-v-4fd05aee"><view class="shop-title_box data-v-4fd05aee">您访问过的供应商</view><view class="shop-list_box data-v-4fd05aee"><block wx:if="{{!$root.g0}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__" wx:key="shopId"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/customerPlace'],['query',{shopId:item.shopId}]]]]]]]}}" bindtap="__e" class="data-v-4fd05aee"><app-avatar-module vue-id="{{'cb65cf00-1-'+__i0__}}" src="https://goss.cfp.cn/creative/vcg/800/new/VCG41N1210205351.jpg" width="{{120}}" class="data-v-4fd05aee" bind:__l="__l"></app-avatar-module><view class="tit data-v-4fd05aee">{{''+item.shopName+''}}</view></view></block></block><block wx:else><view class="_div data-v-4fd05aee">暂无数据</view></block></view><view class="app-footer data-v-4fd05aee"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/index?introMerchantId='+this.userInfo.id+'&form=2&style=2']]]]]]]}}" class="des data-v-4fd05aee" bindtap="__e">我是供应商，点此<text class="data-v-4fd05aee">申请开店</text><view class="iconfont iconxiangyou _i data-v-4fd05aee"></view></view></view></view>

ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.wxml

@@ -1 +1 @@
-<view class="invite-item data-v-57637431"><image class="item-logo data-v-57637431" src="{{info.fullAvatar}}" alt="商品图"></image><view class="item-info data-v-57637431"><view class="info-title data-v-57637431">{{info.name+''}}<block wx:if="{{info.style==2}}"><text class="ghs-info data-v-57637431">供货商</text></block></view><view class="info-row data-v-57637431"><text class="info-tag data-v-57637431">{{info.adminName}}</text><text class="info-tag data-v-57637431">{{info.mobile+''}}</text><text class="info-tag light data-v-57637431">{{info.fee+''}}</text></view></view><view class="{{['data-v-57637431','status']}}"><block wx:if="{{info.status=='2'}}"><text class="{{['data-v-57637431','iconfont','icondagou']}}"></text></block><block wx:else><text class="status-name data-v-57637431">{{getStatusName}}</text></block></view></view>
+<view class="invite-item data-v-57637431"><image class="item-logo data-v-57637431" src="{{info.fullAvatar}}" alt="商品图"></image><view class="item-info data-v-57637431"><view class="info-title data-v-57637431">{{info.name+''}}<block wx:if="{{info.style==2}}"><text class="ghs-info data-v-57637431">供应商</text></block></view><view class="info-row data-v-57637431"><text class="info-tag data-v-57637431">{{info.adminName}}</text><text class="info-tag data-v-57637431">{{info.mobile+''}}</text><text class="info-tag light data-v-57637431">{{info.fee+''}}</text></view></view><view class="{{['data-v-57637431','status']}}"><block wx:if="{{info.status=='2'}}"><text class="{{['data-v-57637431','iconfont','icondagou']}}"></text></block><block wx:else><text class="status-name data-v-57637431">{{getStatusName}}</text></block></view></view>

ghsApp/dist/build/mp-weixin/project.config.json

@@ -10,7 +10,7 @@
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx21b7c3ef12082099",
-  "projectname": "供货商",
+  "projectname": "供应商",
   "condition": {
     "search": {
       "current": -1,

ghsApp/src/admin/billing/affirm.vue

@@ -51,7 +51,7 @@
         <view class="module-com input-line-wrap">
 									<view class="tab-box flex-space">
 										<view class="flex-center tab" :class="isBilling?'active':''" @tap="isBilling=true">开单</view>
-										<view class="flex-center tab" :class="isBilling?'':'active'" @tap="isBilling=false">报损登记</view>
+										<view class="flex-center tab" :class="isBilling?'':'active'" @tap="isBilling=false">报损</view>
 									</view>
 									<view class="" v-if="isBilling">
           <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="showCustomer = true">

ghsApp/src/admin/home/apply.vue

@@ -78,7 +78,7 @@
 	                            url: "/admin/staff/achieve"
 	                        },
                             {
-                                name: "供货商",
+                                name: "供应商",
                                 img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,
                                 url: "/admin/ghs/shop"
                             },

ghsApp/src/api/apply/index.js

@@ -1,14 +1,14 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
 /**
- * 邀请花店（零售、供货商相同）  wangning  2021-6-13
+ * 邀请花店（零售、供应商相同）  wangning  2021-6-13
  * @param {*} name
  */
 export const applyInviteHdPoster = name => {
 	return https.get("/apply/invite-hd-poster", { name });
 };
 /**
- * 邀请供货商（零售、供货商相同）
+ * 邀请供应商（零售、供应商相同）
  * @param {*} name
  */
  export const applyInviteGhsPoster = name => {

ghsApp/src/api/ghs/index.js

@@ -1,14 +1,14 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 供货商列表 姜枫 2021.04.01  ghs/add
+ * 供应商列表 姜枫 2021.04.01  ghs/add
  */
 export const getList = data => {
 	return https.get('/ghs/list', data)
 }
 
 /** *
- * 添加供货商 汪宁 2021.06.11  
+ * 添加供应商 汪宁 2021.06.11  
  */
  export const ghsAdd = data => {
 	return https.post('/ghs/add', data)

ghsApp/src/api/main/index.js

@@ -1,7 +1,7 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 商城分享（零售、供货商相同） b  wangning  2021-6-12
+ * 商城分享（零售、供应商相同） b  wangning  2021-6-12
  */
 export const mainGetMallPoster = data => {
 	return https.get('/main/get-mall-poster', data)

ghsApp/src/components/app-supplier-sel.vue

@@ -3,7 +3,7 @@
 		<bottom-popup class="popup-wrap" :show="showPopup" @close="hidePopup">
 			<div class="map-wrap">
 				<div class="map-top-tit-wrap">
-					<div class="map-top-tit">请选择供货商</div>
+					<div class="map-top-tit">请选择供应商</div>
 					<app-close icon="iconguanbi" @close="hidePopup" />
 				</div>
 				<!-- 搜索 -->

ghsApp/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "供货商",
+    "name" : "供应商",
     "appid" : "",
     "description" : "应用描述",
     "versionName" : "1.0.0",

ghsApp/src/pages.json

@@ -204,7 +204,7 @@
 		{
 			"root": "admin/ghs",
 			"pages": [
-				{"path": "shop","style": {"navigationBarTitleText": "供货商"}}
+				{"path": "shop","style": {"navigationBarTitleText": "供应商"}}
 			]
 		},
 		{
@@ -643,14 +643,14 @@
         {
 					"path": "supplier",
 					"style": {
-						"navigationBarTitleText": "供货商",
+						"navigationBarTitleText": "供应商",
 						"enablePullDownRefresh": true
 					}
 				},
         {
 					"path": "suppAdd",  
 					"style": {
-						"navigationBarTitleText": "添加供货商",
+						"navigationBarTitleText": "添加供应商",
 						"enablePullDownRefresh": true
 					}
 				},

ghsApp/src/pagesClient/official/latest-shop.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="latest-content_box">
       <view class="shop-title_box">
-          您访问过的供货商
+          您访问过的供应商
       </view>
       <view class="shop-list_box">
           <template v-if="!$util.isEmpty(list)">
@@ -28,7 +28,7 @@
           <view @click="pageTo({
             url:`/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2`
           })" class="des">
-              我是供货商，点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
+              我是供应商，点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
           </view>
       </view>
   </view>

ghsApp/src/pagesInvite/inviteItem.vue

@@ -6,7 +6,7 @@
 			alt="商品图"
 		/>
 		<view class="item-info">
-			<view class="info-title">{{ info.name }} <text class="ghs-info" v-if="info.style ==2">供货商</text></view>
+			<view class="info-title">{{ info.name }} <text class="ghs-info" v-if="info.style ==2">供应商</text></view>
 			<view class="info-row">
 				<text class="info-tag">{{ info.adminName }}</text>
 				<text class="info-tag">{{ info.mobile }} </text>

ghsApp/src/pagesPurchase/details.vue

@@ -368,7 +368,7 @@ export default {
 		formSubmit(e) {
 
 			if(this.supplier==''){
-				uni.showToast({title:'请选择供货商',icon:'none'});return;
+				uni.showToast({title:'请选择供应商',icon:'none'});return;
 			}
 			// 表单规则
 			let rules = [

ghsApp/src/pagesPurchase/supplier.vue

@@ -6,7 +6,7 @@
       scroll-view
     >
     <block>
-        <!-- 供货商列表 -->
+        <!-- 供应商列表 -->
         <block v-if="!$util.isEmpty(supplierList)">
           <view
             class="list_item"
@@ -96,7 +96,7 @@ export default {
         type:2
       })
     },
-    // 添加供货商
+    // 添加供应商
     add() {
       this.pageTo({
         url: '/pagesPurchase/suppAdd'

hdApp/dist/build/mp-weixin/admin/ghs/shop.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "供货商",
+  "navigationBarTitleText": "供应商",
   "usingComponents": {
     "app-wrapper-empty": "/components/app-wrapper-empty"
   }

hdApp/dist/build/mp-weixin/pagesClient/official/latest-shop.wxml

@@ -1 +1 @@
-<view class="latest-content_box data-v-4fd05aee"><view class="shop-title_box data-v-4fd05aee">您访问过的供货商</view><view class="shop-list_box data-v-4fd05aee"><block wx:if="{{!$root.g0}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__" wx:key="shopId"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/customerPlace'],['query',{shopId:item.shopId}]]]]]]]}}" bindtap="__e" class="data-v-4fd05aee"><app-avatar-module vue-id="{{'cb65cf00-1-'+__i0__}}" src="https://goss.cfp.cn/creative/vcg/800/new/VCG41N1210205351.jpg" width="{{120}}" class="data-v-4fd05aee" bind:__l="__l"></app-avatar-module><view class="tit data-v-4fd05aee">{{''+item.shopName+''}}</view></view></block></block><block wx:else><view class="_div data-v-4fd05aee">暂无数据</view></block></view><view class="app-footer data-v-4fd05aee"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/index?introMerchantId='+this.userInfo.id+'&form=2&style=2']]]]]]]}}" class="des data-v-4fd05aee" bindtap="__e">我是供货商，点此<text class="data-v-4fd05aee">申请开店</text><view class="iconfont iconxiangyou _i data-v-4fd05aee"></view></view></view></view>
+<view class="latest-content_box data-v-4fd05aee"><view class="shop-title_box data-v-4fd05aee">您访问过的供应商</view><view class="shop-list_box data-v-4fd05aee"><block wx:if="{{!$root.g0}}"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="__i0__" wx:key="shopId"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/admin/billing/customerPlace'],['query',{shopId:item.shopId}]]]]]]]}}" bindtap="__e" class="data-v-4fd05aee"><app-avatar-module vue-id="{{'cb65cf00-1-'+__i0__}}" src="https://goss.cfp.cn/creative/vcg/800/new/VCG41N1210205351.jpg" width="{{120}}" class="data-v-4fd05aee" bind:__l="__l"></app-avatar-module><view class="tit data-v-4fd05aee">{{''+item.shopName+''}}</view></view></block></block><block wx:else><view class="_div data-v-4fd05aee">暂无数据</view></block></view><view class="app-footer data-v-4fd05aee"><view data-event-opts="{{[['tap',[['pageTo',[['o',['url','/pagesClient/official/index?introMerchantId='+this.userInfo.id+'&form=2&style=2']]]]]]]}}" class="des data-v-4fd05aee" bindtap="__e">我是供应商，点此<text class="data-v-4fd05aee">申请开店</text><view class="iconfont iconxiangyou _i data-v-4fd05aee"></view></view></view></view>

hdApp/dist/build/mp-weixin/pagesInvite/inviteItem.wxml

@@ -1 +1 @@
-<view class="invite-item data-v-57637431"><image class="item-logo data-v-57637431" src="{{info.fullAvatar}}" alt="商品图"></image><view class="item-info data-v-57637431"><view class="info-title data-v-57637431">{{info.name+''}}<block wx:if="{{info.style==2}}"><text class="ghs-info data-v-57637431">供货商</text></block></view><view class="info-row data-v-57637431"><text class="info-tag data-v-57637431">{{info.adminName}}</text><text class="info-tag data-v-57637431">{{info.mobile+''}}</text><text class="info-tag light data-v-57637431">{{info.fee+''}}</text></view></view><view class="{{['data-v-57637431','status']}}"><block wx:if="{{info.status=='2'}}"><text class="{{['data-v-57637431','iconfont','icondagou']}}"></text></block><block wx:else><text class="status-name data-v-57637431">{{getStatusName}}</text></block></view></view>
+<view class="invite-item data-v-57637431"><image class="item-logo data-v-57637431" src="{{info.fullAvatar}}" alt="商品图"></image><view class="item-info data-v-57637431"><view class="info-title data-v-57637431">{{info.name+''}}<block wx:if="{{info.style==2}}"><text class="ghs-info data-v-57637431">供应商</text></block></view><view class="info-row data-v-57637431"><text class="info-tag data-v-57637431">{{info.adminName}}</text><text class="info-tag data-v-57637431">{{info.mobile+''}}</text><text class="info-tag light data-v-57637431">{{info.fee+''}}</text></view></view><view class="{{['data-v-57637431','status']}}"><block wx:if="{{info.status=='2'}}"><text class="{{['data-v-57637431','iconfont','icondagou']}}"></text></block><block wx:else><text class="status-name data-v-57637431">{{getStatusName}}</text></block></view></view>

hdApp/src/api/apply/index.js

@@ -1,14 +1,14 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
 /**
- * 邀请供货商（零售、供货商相同）
+ * 邀请供应商（零售、供应商相同）
  * @param {*} name
  */
 export const applyInviteGhsPoster = name => {
 	return https.get("/apply/invite-ghs-poster", { name });
 };
 /**
- * 邀请花店（零售、供货商相同）  wangning  2021-6-13
+ * 邀请花店（零售、供应商相同）  wangning  2021-6-13
  * @param {*} name
  */
  export const applyInviteHdPoster = name => {

hdApp/src/api/ghs/index.js

@@ -1,7 +1,7 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 供货商列表 姜枫 2021.04.01
+ * 供应商列表 姜枫 2021.04.01
  */
 export const getList = data => {
 	return https.get('/ghs/list', data)

hdApp/src/api/main/index.js

@@ -1,7 +1,7 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
 /** *
- * 商城分享（零售、供货商相同） b  wangning  2021-6-12
+ * 商城分享（零售、供应商相同） b  wangning  2021-6-12
  */
 export const mainGetMallPoster = data => {
 	return https.get('/main/get-mall-poster', data)

hdApp/src/api/product/index.js

@@ -74,7 +74,7 @@ export const  pxClassDel = data => {
   return https.get("/px-class/del", data);
 };
 /** *
- * 供货商花材列表（进店开单） 【采购开单】 
+ * 供应商花材列表（进店开单） 【采购开单】 
  */
  export const getGhsProductList = data => {
 	return https.get('/product/ghs-item', data)

hdApp/src/api/purchase/index.js

@@ -22,7 +22,7 @@ export const createPurchaseOrderApi = async data => {
 };
 
 /** *
- * 供货商列表
+ * 供应商列表
  */
  export const ghsList = async data => {
 	return https.get("/ghs/list", data);
@@ -43,7 +43,7 @@ export const createPurchaseOrderApi = async data => {
 };
 
 /** *
- * 供货商详情  
+ * 供应商详情  
  */
  export const ghsDetail = async data => {
 	return https.get("/ghs/detail", data);

hdApp/src/pages.json

@@ -217,7 +217,7 @@
 		{
 			"root": "admin/ghs",
 			"pages": [
-				{"path": "shop","style": {"navigationBarTitleText": "供货商"}}
+				{"path": "shop","style": {"navigationBarTitleText": "供应商"}}
 			]
 		},
 		{

hdApp/src/pagesClient/official/latest-shop.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="latest-content_box">
       <view class="shop-title_box">
-          您访问过的供货商
+          您访问过的供应商
       </view>
       <view class="shop-list_box">
           <template v-if="!$util.isEmpty(list)">
@@ -28,7 +28,7 @@
           <view @click="pageTo({
             url:`/pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2`
           })" class="des">
-              我是供货商，点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
+              我是供应商，点此 <text>申请开店</text><i class="iconfont iconxiangyou"></i>
           </view>
       </view>
   </view>

hdApp/src/pagesInvite/inviteItem.vue

@@ -6,7 +6,7 @@
 			alt="商品图"
 		/>
 		<view class="item-info">
-			<view class="info-title">{{ info.name }} <text class="ghs-info" v-if="info.style ==2">供货商</text></view>
+			<view class="info-title">{{ info.name }} <text class="ghs-info" v-if="info.style ==2">供应商</text></view>
 			<view class="info-row">
 				<text class="info-tag">{{ info.adminName }}</text>
 				<text class="info-tag">{{ info.mobile }} </text>

hdApp/src/pagesPurchase/gathering.vue

@@ -2,7 +2,7 @@
   <view class="order-page">
     <view class="top-view">
       <view class="top-row">
-        <text class="header-item">供货商</text>
+        <text class="header-item">供应商</text>
         <text class="header-item">总欠款 </text>
       </view>
       <view class="top-row">

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -239,7 +239,7 @@ export default {
 				}
 			}
 
-			//只要拿到供货商的门店ID即可先取花材，不需要生成供货商id
+			//只要拿到供应商的门店ID即可先取花材，不需要生成供应商id
 			const { shopId,id} = this.option;
 			this.initGhsData(id,shopId);
 

hdApp/src/pagesPurchase/order.vue

@@ -57,7 +57,7 @@ export default {
     return {
       tabs: [
         {
-          name: "供货商",
+          name: "供应商",
           key: "",
         },
         {

pt/src/saas/shop/components/balance-detail.vue

@@ -60,7 +60,7 @@ export default {
 			this.showBalanceDetail = false;
 		},
 		handleClick() {
-			// ptStyle 1 零售 2供货商
+			// ptStyle 1 零售 2供应商
 			// tx 0全部 2 可提现
 			switch (this.tabIndex) {
 				case '-1':
@@ -145,7 +145,7 @@ export default {
 					console.log(asset,)
 				})
 				.done();
-			// ptStyle 1 零售 2供货商
+			// ptStyle 1 零售 2供应商
 			// tx 0全部 2 可提现
 			app.refresh({ shopId:this.orderOperate.id,ptStyle: this.orderOperate.ptStyle,tx:0 });
 

pt/src/saas/shop/list.vue

@@ -60,17 +60,17 @@
             type="primary"
             size="mini"
             @click="bindJump(`/wx-open/begin-auth?id=ghs&authType=1`)"
-          >供货商公众号激活</el-button>
+          >供应商公众号激活</el-button>
           <el-button
             type="primary"
             size="mini"
             @click="bindJump(`/wx-open/begin-auth?id=ghs&authType=2`)"
-          >供货商小程序激活</el-button>
+          >供应商小程序激活</el-button>
           <el-button
             type="primary"
             size="mini"
             @click="bindJump(`/wx-open/bind-open?id=ghs&actId=6`)"
-          >供货商小程序体验码</el-button>
+          >供应商小程序体验码</el-button>
         </div>
       </template>
 
@@ -198,7 +198,7 @@
           >
             <el-input
               v-model="adForm.name"
-              placeholder="请输入商家名称，将生成昆明供货商"
+              placeholder="请输入商家名称，将生成昆明供应商"
               size="small"
             ></el-input>
           </el-form-item>

pt/src/views/assets/ptYeChange.vue

@@ -34,7 +34,7 @@
 						val: 0
 					},
 					{
-						text: '供货商',
+						text: '供应商',
 						key: '3',
 						val: 0
 					},

开发/ghsApp/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "供货商",
+    "name" : "供应商",
     "appid" : "",
     "description" : "应用描述",
     "versionName" : "1.0.0",

线上/ghsApp/src/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "供货商",
+    "name" : "供应商",
     "appid" : "",
     "description" : "应用描述",
     "versionName" : "1.0.0",