shish 5 lat temu
rodzic
commit
8f46327197
44 zmienionych plików z 111 dodań i 91 usunięć
  1. 0 0
      ghs/dist/shop/css/chunk-253f3639.a01fbdc1.css
  2. 0 0
      ghs/dist/shop/css/chunk-29d4c545.bcf38a55.css
  3. 1 0
      ghs/dist/shop/css/chunk-39cbdf7e.3caf5154.css
  4. 0 0
      ghs/dist/shop/css/chunk-3f151574.7bbd51d6.css
  5. 0 1
      ghs/dist/shop/css/chunk-58a12740.c9193299.css
  6. 0 0
      ghs/dist/shop/css/chunk-c4ed7298.7ddfbf33.css
  7. 0 0
      ghs/dist/shop/css/chunk-efc3c0fc.0aa21f56.css
  8. 2 2
      ghs/dist/shop/index.html
  9. 0 0
      ghs/dist/shop/js/app.c0ca3d65.js
  10. 0 0
      ghs/dist/shop/js/chunk-253f3639.45a0c6a5.js
  11. 0 0
      ghs/dist/shop/js/chunk-29d4c545.e7eb3980.js
  12. 0 0
      ghs/dist/shop/js/chunk-39cbdf7e.88eef549.js
  13. 0 0
      ghs/dist/shop/js/chunk-3f151574.cd7fa857.js
  14. 0 0
      ghs/dist/shop/js/chunk-589e98c4.dc04d109.js
  15. 0 0
      ghs/dist/shop/js/chunk-58a12740.0b5ad943.js
  16. 0 0
      ghs/dist/shop/js/chunk-5dd145f6.28998230.js
  17. 0 0
      ghs/dist/shop/js/chunk-9b1575e4.176bff78.js
  18. 0 0
      ghs/dist/shop/js/chunk-c4ed7298.71fd728f.js
  19. 0 0
      ghs/dist/shop/js/chunk-efc3c0fc.9b99ed61.js
  20. 4 4
      ghs/vue.config.js
  21. 23 0
      ghsApp/dist/build/mp-weixin/project.private.config.json
  22. 15 11
      ghsApp/src/admin/itemClass/list.vue
  23. 6 6
      ghsApp/src/ext.json
  24. 4 1
      ghsApp/src/manifest.json
  25. 6 6
      ghsApp/src/static/iconfont/iconfont.css
  26. 0 0
      hd/dist/shop/css/chunk-36feef55.23d6db58.css
  27. 0 0
      hd/dist/shop/css/chunk-4918ff42.ff8bad21.css
  28. 2 2
      hd/dist/shop/index.html
  29. 0 0
      hd/dist/shop/js/app.cd5a1b2a.js
  30. 0 0
      hd/dist/shop/js/chunk-36feef55.4f552b09.js
  31. 0 0
      hd/dist/shop/js/chunk-4918ff42.b3e5e6d3.js
  32. 0 0
      hd/dist/shop/js/chunk-57a5227d.1bdee1fc.js
  33. 0 0
      hd/dist/shop/js/chunk-87f6cb56.c338e47f.js
  34. 4 4
      hd/vue.config.js
  35. 13 23
      hdApp/dist/build/mp-weixin/project.config.json
  36. 6 6
      hdApp/src/ext.json
  37. 1 1
      hdApp/src/manifest.json
  38. 6 6
      hdApp/src/static/iconfont/iconfont.css
  39. 5 5
      mallApp/src/ext.json
  40. 1 1
      mallApp/src/manifest.json
  41. 6 6
      mallApp/src/static/iconfont/iconfont.css
  42. 2 2
      pt/dist/web/index.html
  43. 0 0
      pt/dist/web/js/app.6e859856.js
  44. 4 4
      pt/vue.config.js

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-253f3639.a01fbdc1.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-29d4c545.bcf38a55.css


+ 1 - 0
ghs/dist/shop/css/chunk-39cbdf7e.3caf5154.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-851feb34]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-851feb34]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-851feb34]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-851feb34]{font-size:18px}.el-dialog .el-dialog__body[data-v-851feb34]{padding:20px}.el-dialog .el-dialog__footer[data-v-851feb34]{padding-bottom:15px}.cl-upload[data-v-851feb34]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.cl-upload .upload-wrap[data-v-851feb34]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:120px;width:120px;cursor:pointer;border:1px dashed #d9d9d9;border-radius:6px;margin-right:10px;position:relative}.cl-upload .upload-wrap .el-icon-plus[data-v-851feb34]{font-size:28px;color:#8c939d}.cl-upload .upload-wrap .el-icon-close[data-v-851feb34]{position:absolute;right:5px;top:5px;color:red;background-color:#f56c6c;color:#fff;border-radius:100%;padding:2px}.cl-upload .upload-wrap .el-icon-close[data-v-851feb34]:hover{background-color:red}.cl-upload .upload-wrap img[data-v-851feb34]{height:100%;width:100%;border-radius:6px}.cl-upload .upload-wrap[data-v-851feb34]:hover{border:1px dashed #409eff}

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-3f151574.7bbd51d6.css


+ 0 - 1
ghs/dist/shop/css/chunk-58a12740.c9193299.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-27f252ef]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-27f252ef]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-27f252ef]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-27f252ef]{font-size:18px}.el-dialog .el-dialog__body[data-v-27f252ef]{padding:20px}.el-dialog .el-dialog__footer[data-v-27f252ef]{padding-bottom:15px}.cl-upload[data-v-27f252ef]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.cl-upload .upload-wrap[data-v-27f252ef]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:120px;width:120px;cursor:pointer;border:1px dashed #d9d9d9;border-radius:6px;margin-right:10px;position:relative}.cl-upload .upload-wrap .el-icon-plus[data-v-27f252ef]{font-size:28px;color:#8c939d}.cl-upload .upload-wrap .el-icon-close[data-v-27f252ef]{position:absolute;right:5px;top:5px;color:red;background-color:#f56c6c;color:#fff;border-radius:100%;padding:2px}.cl-upload .upload-wrap .el-icon-close[data-v-27f252ef]:hover{background-color:red}.cl-upload .upload-wrap img[data-v-27f252ef]{height:100%;width:100%;border-radius:6px}.cl-upload .upload-wrap[data-v-27f252ef]:hover{border:1px dashed #409eff}

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-c4ed7298.7ddfbf33.css


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/css/chunk-efc3c0fc.0aa21f56.css


+ 2 - 2
ghs/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -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.b581c966.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.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="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.b581c966.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.c0ca3d65.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.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="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.c0ca3d65.js"></script></body></html>

Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/app.c0ca3d65.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-253f3639.45a0c6a5.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-29d4c545.e7eb3980.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-39cbdf7e.88eef549.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-3f151574.cd7fa857.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-589e98c4.dc04d109.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-58a12740.0b5ad943.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-5dd145f6.28998230.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-9b1575e4.176bff78.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-c4ed7298.71fd728f.js


Plik diff jest za duży
+ 0 - 0
ghs/dist/shop/js/chunk-efc3c0fc.9b99ed61.js


+ 4 - 4
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 = 'http://api.shop.hzghd.com';
+const proxyTarget = 'https://api.shop.wixhb.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 = `http://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }else{
-	hostUrl = `https://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }
 
 const cdn = {

+ 23 - 0
ghsApp/dist/build/mp-weixin/project.private.config.json

@@ -0,0 +1,23 @@
+{
+  "condition": {
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": [
+        {
+          "name": "admin/itemClass/list",
+          "pathName": "admin/itemClass/list",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
+}

+ 15 - 11
ghsApp/src/admin/itemClass/list.vue

@@ -3,10 +3,11 @@
 		<!-- list -->
 		<div class="list-wrap">
 			<block v-if="!$util.isEmpty(list.data)">
-				<div class="list" v-for="(item, index) in list.data" :key="index">
+				<div class="list" v-for="(item, index) in list.data" :key="index" @click="editItem(item)">
+					
 					<div class="list-index">{{ item.id }}</div>
 					<div class="list-img">
-						<img :src="`${constant.imgUrl}/hhb_small.png`" alt="" mode="widthFix" style="width:120rpx"/>
+						<img :src="`${constant.imgUrl}/hhb_small.png`" alt="" mode="widthFix" style="width:90rpx"/>
 					</div>
 					<div class="list-det">
 						<div class="app-size-28 app-color-0">{{ item.name || '' }}</div>
@@ -22,6 +23,7 @@
 							</div>
 						</div>
 					</div>
+					
 				</div>
 				<!-- operate -->
 				<operate-module 
@@ -139,6 +141,15 @@ export default {
 	onLoad() {
 	},
 	methods: {
+		editItem(item){
+				this.modifyModal = true
+				this.modifyTitle = '编辑'
+				this.replaceForm = {
+                    id:item.id,
+					name: item.name,
+					inTurn: item.inTurn,
+				}			
+		},
 		operateList(index){
 			if(index === 0){
 				this.modifyModal = true
@@ -170,7 +181,7 @@ export default {
 			host({
 				...form
 			}).then(res => {
-				this.$msg('操作成功!')
+				this.$msg('操作成功')
 				this.modalCancel()
 				this.operateCancle()
 				setTimeout(() => {
@@ -227,7 +238,6 @@ export default {
 			this.operateIndex = null
 			this.operateShow = false
 		},
-        //点击页面取消
         globalClick(){
             this.operateCancle()
         },
@@ -247,23 +257,19 @@ export default {
 		min-height: calc(100vh - 100px);
 		padding-bottom: 100px;
 	}
-	// list
 	.list-wrap {
 		position: relative;
 		background-color: #fff;
 		.list {
 			height: 130px;
 			@include disFlex(center, flex-start);
-			padding: 80rpx 0 80rpx 0;
-			margin: 0 30px;
+			margin: 0 30px 0 30px;
 			color: $fontColor3;
 			border-bottom: 1px solid $borderColor;
 			.list-index {
 				width: 50px;
 			}
 			.list-img {
-				width: 130px;
-				height: 130px;
 				img {
 					height: 100%;
 				}
@@ -298,14 +304,12 @@ export default {
 			margin-right: 30px;
 		}
 	}
-	// 编辑弹窗
 	.modify-modal {
 		.prompt-text {
 			color: red;
 			position: relative;
 			right: 52px;
 			bottom: 24px;
-			// margin-bottom: 10px;
 		}
 		.line-label {
 			width: 140px;

+ 6 - 6
ghsApp/src/ext.json

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

+ 4 - 1
ghsApp/src/manifest.json

@@ -83,10 +83,13 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+		"optimization" : {
+			"subPackages" : true
+		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {

+ 6 - 6
ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  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');
+  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');
 }
 
 .iconfont {

Plik diff jest za duży
+ 0 - 0
hd/dist/shop/css/chunk-36feef55.23d6db58.css


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/css/chunk-4918ff42.ff8bad21.css


+ 2 - 2
hd/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>只管花</title><link href="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>只管花</title><link href="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -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.371b7fd7.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.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="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.371b7fd7.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.cd5a1b2a.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.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="https://img.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.cd5a1b2a.js"></script></body></html>

Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/app.cd5a1b2a.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-36feef55.4f552b09.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-4918ff42.b3e5e6d3.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-57a5227d.1bdee1fc.js


Plik diff jest za duży
+ 0 - 0
hd/dist/shop/js/chunk-87f6cb56.c338e47f.js


+ 4 - 4
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 = 'http://api.shop.huaml.com';
+const proxyTarget = 'https://api.shop.huahb.cn';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }else{
-	hostUrl = `https://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }
 const cdn = {
 	dev: {

+ 13 - 23
hdApp/dist/build/mp-weixin/project.config.json

@@ -4,39 +4,29 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
+    "urlCheck": true,
+    "scopeDataCheck": false,
+    "coverView": true,
+    "es6": false,
     "postcss": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
     "preloadBackgroundData": false,
     "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
     "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
+    "newFeature": false,
     "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
+    "useIsolateContext": true,
+    "nodeModules": false,
+    "enhance": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花惠宝"
   }
 }

+ 1 - 1
hdApp/src/manifest.json

@@ -84,7 +84,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花惠宝) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

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

+ 5 - 5
mallApp/src/ext.json

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

+ 1 - 1
mallApp/src/manifest.json

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

+ 6 - 6
mallApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  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');
+  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');
 }
 
 .iconfont {

+ 2 - 2
pt/dist/web/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>花卉宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>花卉宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -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.c0d3a222.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="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.c0d3a222.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.6e859856.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="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.6e859856.js"></script></body></html>

Plik diff jest za duży
+ 0 - 0
pt/dist/web/js/app.6e859856.js


+ 4 - 4
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' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
+	process.env.NODE_ENV == 'local' ? 'https://api.pt.wixhb.com' : 'https://api.pt.wixhb.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.hzghd.com/`;
+	hostUrl = `http://img.wixhb.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `http://img.wixhb.com/`;
 }else{
-	hostUrl = `https://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }
 
 const cdn = {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików