开发

ghs/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.wixhb.com';
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -14,11 +14,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else{
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `https://img.hzghd.com/`;
 }
 
 const cdn = {

ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxcf32b3f0684c2433",
+  "extAppid": "wx21b7c3ef12082099",
   "directCommit": false,
   "ext": {
-    "account": 12358,
-    "apiHost": "https://api.shop.wixhb.com",
-    "socketApiHost": "api.shop.wixhb.com",
-    "imgHost": "https://img.wixhb.com",
-    "name":"销花宝"
+    "account": 12362,
+    "apiHost": "https://api.shop.hzghd.com",
+    "socketApiHost": "api.shop.hzghd.com",
+    "imgHost": "https://img.hzghd.com",
+    "name":"花掌柜"
   }
 }

ghsApp/src/static/iconfont/iconfont.css

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

hd/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.huahb.cn';
+const proxyTarget = 'http://api.shop.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `http://img.huaml.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `http://img.huaml.com/`;
 }else{
-	hostUrl = `https://img.huahb.cn/`;
+	hostUrl = `https://img.huaml.com/`;
 }
 const cdn = {
 	dev: {

mallApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx99a1dfc4171efb42",
+  "extAppid": "wxe41bd5816affd0ba",
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.zhiguanhua.cn",
-    "socketApiHost": "api.shop.zhiguanhua.cn",
-    "imgHost": "https://img.zhiguanhua.cn",
-    "name":"花卉宝"
+    "apiHost": "https://api.shop.theflorist.cn",
+    "socketApiHost": "api.shop.theflorist.cn",
+    "imgHost": "https://img.theflorist.cn",
+    "name":"中花卉"
   }
 }

mallApp/src/manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wx99a1dfc4171efb42",
+        "appid" : "wxe41bd5816affd0ba",
         "setting" : {
             "urlCheck" : false
         },

mallApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
-  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
-  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
+  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot');
+  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
+  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 }
 
 .iconfont {

pt/src/saas/shop/deposit.vue

@@ -110,13 +110,13 @@ export default {
 							prop: 'sjName',
 							label: '商家',
 							align: 'center',
-							width: '120'
+							width: '100'
 						},
 						{
 							prop: 'shopName',
 							label: '门店',
 							align: 'center',
-							width: '120'
+							width: '100'
 						},
 						{
 							prop: 'sjId',
@@ -132,19 +132,33 @@ export default {
 						},
 						{
 							prop: 'cashName',
-							label: '收款人姓名',
+							label: '申请人',
 							align: 'center',
-							width: '120'
+							width: '100'
 						},
 						{
 							prop: 'cashAccount',
-							label: '收款人帐号',
+							label: '收款帐号',
 							align: 'center',
-							width: '130'
+							width: '100'
 						},
 						{
 							prop: 'amount',
-							label: '提现金额',
+							label: '申请提现',
+							align: 'center',
+							emptyText: '无',
+							width: '100'
+						},
+						{
+							prop: 'beAmount',
+							label: '应转',
+							align: 'center',
+							emptyText: '无',
+							width: '100'
+						},
+						{
+							prop: 'getAmount',
+							label: '到帐',
 							align: 'center',
 							emptyText: '无',
 							width: '100'
@@ -161,7 +175,7 @@ export default {
 							label: '备注',
 							align: 'center',
 							emptyText: '',
-							width: '180'
+							width: '160'
 						},
 						{
 							prop: 'status',
@@ -173,7 +187,8 @@ export default {
 							prop: 'addTime',
 							label: '提交时间',
 							align: 'center',
-							emptyText: '无'
+							emptyText: '无',
+							width: '135'
 						}
 					],
 					// 操作列

pt/vue.config.js

@@ -4,7 +4,7 @@ const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行 npm run serve 即可 shish 2021.4.12
 const proxyTarget =
-	process.env.NODE_ENV == 'local' ? 'https://api.pt.wixhb.com' : 'https://api.pt.wixhb.com';
+	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -15,11 +15,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.wixhb.com/`;
+	hostUrl = `http://img.hzghd.com/`;
 }else{
-	hostUrl = `https://img.wixhb.com/`;
+	hostUrl = `https://img.hzghd.com/`;
 }
 
 const cdn = {