Domů Procházet Nápověda
Registrovat se Přihlásit se
zhh
/
front-end
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

线上

shish před 5 roky
rodič
22f7c09704
revize
0911750b0d
33 změnil soubory, kde provedl 75 přidání a 77 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 0 0
      ghs/dist/shop/css/chunk-7d9babba.d3f6fb56.css
  2. 0 0
      ghs/dist/shop/css/chunk-805650f0.42a1930d.css
  3. 0 0
      ghs/dist/shop/css/chunk-b3f07994.b76dc59c.css
  4. 0 0
      ghs/dist/shop/css/chunk-efc3c0fc.0aa21f56.css
  5. 2 2
      ghs/dist/shop/index.html
  6. 0 0
      ghs/dist/shop/js/app.18d42333.js
  7. 0 0
      ghs/dist/shop/js/app.e813c058.js
  8. 0 0
      ghs/dist/shop/js/chunk-3973e768.0a71d7f1.js
  9. 0 0
      ghs/dist/shop/js/chunk-7d9babba.13931518.js
  10. 0 0
      ghs/dist/shop/js/chunk-7f4a453c.08c9d4fe.js
  11. 0 0
      ghs/dist/shop/js/chunk-7f4a453c.36254a15.js
  12. 0 0
      ghs/dist/shop/js/chunk-805650f0.2792066e.js
  13. 0 0
      ghs/dist/shop/js/chunk-b3f07994.47653f26.js
  14. 0 0
      ghs/dist/shop/js/chunk-efc3c0fc.9b99ed61.js
  15. 1 1
      ghs/src/mock/userInfo.js
  16. 11 19
      ghs/src/views/item/import.vue
  17. 1 1
      ghs/src/views/item/list.vue
  18. 4 4
      ghs/vue.config.js
  19. 6 6
      ghsApp/src/ext.json
  20. 7 1
      ghsApp/src/manifest.json
  21. 6 6
      ghsApp/src/static/iconfont/iconfont.css
  22. 2 2
      hd/dist/shop/index.html
  23. 0 0
      hd/dist/shop/js/app.3f100d37.js
  24. 4 4
      hd/vue.config.js
  25. 6 6
      hdApp/src/ext.json
  26. 1 1
      hdApp/src/manifest.json
  27. 6 6
      hdApp/src/static/iconfont/iconfont.css
  28. 5 5
      mallApp/src/ext.json
  29. 1 1
      mallApp/src/manifest.json
  30. 6 6
      mallApp/src/static/iconfont/iconfont.css
  31. 2 2
      pt/dist/web/index.html
  32. 0 0
      pt/dist/web/js/app.dabf8f87.js
  33. 4 4
      pt/vue.config.js

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/css/chunk-7d9babba.d3f6fb56.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/css/chunk-805650f0.42a1930d.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/css/chunk-b3f07994.b76dc59c.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/css/chunk-efc3c0fc.0aa21f56.css


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

@@ -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.18d42333.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.18d42333.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.e813c058.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.e813c058.js"></script></body></html>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/app.18d42333.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/app.e813c058.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-3973e768.0a71d7f1.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-7d9babba.13931518.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-7f4a453c.08c9d4fe.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-7f4a453c.36254a15.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-805650f0.2792066e.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-b3f07994.47653f26.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ghs/dist/shop/js/chunk-efc3c0fc.9b99ed61.js


+ 1 - 1
ghs/src/mock/userInfo.js
Zobrazit soubor 

@@ -159,7 +159,7 @@ let menu = {
 
 		{id: '4',parentId: null,name: '花材',type: 0,icon: 'iconshangpinguanli',orderNum: 4,router: '/item/list',viewPath: 'views/item/list.vue',keepAlive: 1},
 
 		{id: '405',	parentId: '4',name: '花材列表',type: 1,icon: 'icon-user',orderNum: 4,router: '/item/list',viewPath: 'views/item/list.vue',keepAlive: 1},
 
 		{id: '401',parentId: '4',name: '花材分类',type: 1,icon: 'icon-user',orderNum: 4,router: '/item-class/list',viewPath: 'views/item-class/list.vue',keepAlive: 1},
 
-		{id: '809',parentId: '4',name: '花材导入',type: 1,icon: 'icongongzuotai',orderNum: 4,router: '/item-class/add',viewPath: 'views/item-class/add.vue',keepAlive: 1},
 
+		{id: '809',parentId: '4',name: '花材导入',type: 1,icon: 'icongongzuotai',orderNum: 4,router: '/item/import',viewPath: 'views/item/import.vue',keepAlive: 1},
 
 		// 员工管理
 
 		{id: '9',parentId: null,name: '员工',type: 0,icon: 'iconyuangongguanli',orderNum: 9,router: '/staff/list',viewPath: 'views/staff/list.vue',keepAlive: 1},
 
 		{id: '902',parentId: '9',name: '员工列表',type: 1,icon: 'iconkehuguanli',orderNum: 9,router: '/staff/list',viewPath: 'views/staff/list.vue',keepAlive: 1},

+ 11 - 19
ghs/src/views/item-class/add.vue → ghs/src/views/item/import.vue
Zobrazit soubor 

@@ -90,6 +90,7 @@
 
         img {
 
           width: 50px;
 
           height: 50px;
 
+          border-radius:5px;
 
         }
 
       }
 
     }
 
@@ -190,9 +191,8 @@
 
           <div class="flex-center infinite-list-title">
 
             <div style="width: 70px;text-align: center">选择</div>
 
             <div style="width: 70px;text-align: center">图片</div>
 
-            <div style="width: 100px;text-align: center">名称</div>
 
+            <div style="width: 120px;text-align: center">名称</div>
 
             <div style="width: 100px;text-align: center">售价</div>
 
-            <div style="width: 100px;text-align: center">库存</div>
 
             <div style="width: 100px;text-align: center">库存预警</div>
 
           </div>
 
           <ul
 
@@ -223,11 +223,12 @@
 
                 <img
 
                   :src="item.cover"
 
                   alt=""
 
+                  style="margin:0 auto;"
 
                 >
 
               </div>
 
-              <div style="width: 100px;text-align: center">
 
+              <div style="width: 120px;text-align: center">
 
                 <el-input
 
-                  style="width: 100px;"
 
+                  style="width: 120px;"
 
                   v-model="item.uname"
 
                   placeholder="请输入"
 
                   :disabled="item.select"
 
@@ -243,16 +244,6 @@
 
                   @click.stop=""
 
                 ></el-input>
 
 
-              </div>
 
-              <div style="width: 100px;text-align: center">
 
-                <el-input
 
-                  style="width: 80px"
 
-                  v-model="item.stock"
 
-                  placeholder="请输入"
 
-                  :disabled="item.select"
 
-                  @click.stop=""
 
-                ></el-input>
 
-
 
               </div>
 
               <div style="width: 100px;text-align: center">
 
                 <el-input
 
@@ -275,7 +266,7 @@
 
               class="flex-center-center"
 
               style="width: 100px;height: 30px;line-height: 30px;text-align: center;color: #ffffff;background: #008ad3;border-radius: 5px;cursor: pointer;display:inline-block; margin-left: 30px;"
 
               @click="saveBtn"
 
-            >保存</div>
 
+            >提交</div>
 
           </div>
 
         </div>
 
         <div class="class-list">
 
@@ -357,9 +348,8 @@ export default {
 
         res.list.forEach(item => {
 
           item.Uselect = false
 
           item.flag = true
 
-          item.price = '0'
 
-          item.stockWarning = '0'
 
-          item.stock = '0'
 
+          item.price = ''
 
+          item.stockWarning = '5'
 
           item.uname = item.name
 
         })
 
         if (this.pageNum != 1) {
 
@@ -625,11 +615,13 @@ export default {
 
         obj.classId = this.ptRightId
 
         obj.price = item.price
 
         obj.stockWarning = item.stockWarning
 
-        obj.stock = item.stock
 
         obj.name = item.uname
 
         param.push(obj)
 
       })
 
       this.$service.item.batchAdd({ data: JSON.stringify(param) }).then(res => {
 
+
 
+        this.$message.success('导入成功');
 
+
 
         this.isSelect()
 
       }).catch(err => { })
 
     }

+ 1 - 1
ghs/src/views/item/list.vue
Zobrazit soubor 

@@ -138,7 +138,7 @@
 
 
       <template #slot-add-goods-btn>
 
 		<!-- <el-button type="primary" size="mini" @click="addFn()">从平台导入</el-button> -->
 
-        <el-button type="primary" size="mini" @click="$util.pageTo({url: '/item-class/add'})">从平台导入</el-button>
 
+        <el-button type="primary" size="mini" @click="$util.pageTo({url: '/item/import'})">从平台导入</el-button>
 
       </template>
 
 		<template #slot-addNew-goods-btn>
 
         <el-button type="primary" size="mini" @click="replaceBtnFn(0)">新增</el-button>

+ 4 - 4
ghs/vue.config.js
Zobrazit soubor 

@@ -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 = {

+ 6 - 6
ghsApp/src/ext.json
Zobrazit soubor 

@@ -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":"销花宝"
 
   }
 
 }

+ 7 - 1
ghsApp/src/manifest.json
Zobrazit soubor 

@@ -83,15 +83,21 @@
 
     "quickapp" : {},
 
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
 
     "mp-weixin" : {
 
-        "appid" : "wx21b7c3ef12082099",
 
+        "appid" : "wxcf32b3f0684c2433",
 
         "setting" : {
 
             "urlCheck" : false
 
         },
 
+		"optimization" : {
 
+			"subPackages" : true
 
+		},
 
         "usingComponents" : true,
 
         "permission" : {
 
             "scope.userLocation" : {
 
                 "desc" : "请点击确定"
 
             }
 
+        },
 
+        "optimization": {  
+            "subPackages": true  
         }
 
     },
 
     "mp-alipay" : {

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

@@ -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 {

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

@@ -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.bf8b80c2.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.bf8b80c2.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.3f100d37.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.3f100d37.js"></script></body></html>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
hd/dist/shop/js/app.3f100d37.js


+ 4 - 4
hd/vue.config.js
Zobrazit soubor 

@@ -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: {

+ 6 - 6
hdApp/src/ext.json
Zobrazit soubor 

@@ -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
Zobrazit soubor 

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

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

@@ -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
Zobrazit soubor 

@@ -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
Zobrazit soubor 

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

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

@@ -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
Zobrazit soubor 

@@ -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.8d97bc49.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.8d97bc49.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.dabf8f87.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.dabf8f87.js"></script></body></html>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
pt/dist/web/js/app.dabf8f87.js


+ 4 - 4
pt/vue.config.js
Zobrazit soubor 

@@ -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 = {

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů