Home Explore Help
Register Sign In
zhh
/
front-end
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'downxls'

shish 1 year ago
parent
c3c6eac448 43df69a04f
commit
aac4e3c1c5
41 changed files with 77 additions and 40 deletions
Split View Show Diff Stats
  1. 0 0
      ghs/dist/shop/css/chunk-327e5fae.f1f00270.css
  2. 0 0
      ghs/dist/shop/css/chunk-4cd382ae.14d6c774.css
  3. 0 0
      ghs/dist/shop/css/chunk-5f27b7a4.0d7a7bda.css
  4. 0 0
      ghs/dist/shop/css/chunk-65e8ef44.34a7eb08.css
  5. 0 0
      ghs/dist/shop/css/chunk-6b5a3656.305f8394.css
  6. 0 0
      ghs/dist/shop/css/chunk-796397fe.edef54f2.css
  7. 0 0
      ghs/dist/shop/css/chunk-de4284e0.6a10f6a2.css
  8. 2 2
      ghs/dist/shop/index.html
  9. 0 0
      ghs/dist/shop/js/app.2dce2aff.js
  10. 0 0
      ghs/dist/shop/js/app.2f81e653.js
  11. 0 0
      ghs/dist/shop/js/chunk-327e5fae.2042865e.js
  12. 0 0
      ghs/dist/shop/js/chunk-4a9a0076.c3e302d4.js
  13. 0 0
      ghs/dist/shop/js/chunk-4cd382ae.1b39466c.js
  14. 0 0
      ghs/dist/shop/js/chunk-5f27b7a4.a40147c0.js
  15. 0 0
      ghs/dist/shop/js/chunk-65e8ef44.6317e831.js
  16. 0 0
      ghs/dist/shop/js/chunk-6b5a3656.437990c3.js
  17. 0 0
      ghs/dist/shop/js/chunk-7928e9ed.efff3bcb.js
  18. 0 0
      ghs/dist/shop/js/chunk-796397fe.1f715de3.js
  19. 0 0
      ghs/dist/shop/js/chunk-de4284e0.c9f8ba74.js
  20. 5 5
      ghs/src/mock/userInfo.js
  21. 7 0
      ghs/src/service/order-item/index.js
  22. 7 0
      ghs/src/service/purchase-order-item/index.js
  23. 13 4
      ghs/src/views/in/add.vue
  24. 12 4
      ghs/src/views/in/list.vue
  25. 12 4
      ghs/src/views/order/add.vue
  26. 1 3
      ghs/src/views/order/list.vue
  27. 2 2
      hd/dist/shop/index.html
  28. 0 0
      hd/dist/shop/js/app.963739b6.js
  29. 1 1
      hdApp/dist/build/h5/index.html
  30. 6 6
      hdApp/dist/build/h5/static/iconfont/iconfont.css
  31. 0 0
      hdApp/dist/build/h5/static/js/index.1d2edf49.js
  32. 0 0
      hdApp/dist/build/h5/static/js/index.4bc77d70.js
  33. 0 0
      hdApp/dist/build/h5/static/js/pagesPurchase-readMe.05deab57.js
  34. 0 0
      hdApp/dist/build/h5/static/js/pagesPurchase-readMe.90e417a2.js
  35. 0 0
      hdApp/dist/build/h5/static/js/pagesPurchase-xj.010a14b7.js
  36. 0 0
      hdApp/dist/build/h5/static/js/pagesPurchase-xj.1850fa2d.js
  37. 1 1
      mallApp/dist/build/h5/index.html
  38. 6 6
      mallApp/dist/build/h5/static/iconfont/iconfont.css
  39. 0 0
      mallApp/dist/build/h5/static/js/index.ceafa4d7.js
  40. 2 2
      pt/dist/web/index.html
  41. 0 0
      pt/dist/web/js/app.1a16acf5.js

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-327e5fae.f1f00270.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-4cd382ae.14d6c774.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-5f27b7a4.0d7a7bda.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-65e8ef44.34a7eb08.css


+ 0 - 0
ghs/dist/shop/css/chunk-323874aa.305f8394.css → ghs/dist/shop/css/chunk-6b5a3656.305f8394.css
View File


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-796397fe.edef54f2.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-de4284e0.6a10f6a2.css


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

@@ -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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><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,
 
+<!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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.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.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.2f81e653.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.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.c536e65e.js"></script><script src="/js/app.2f81e653.js"></script></body></html>
 
+			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.2dce2aff.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.2dce2aff.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.2dce2aff.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.2f81e653.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-327e5fae.2042865e.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-4a9a0076.c3e302d4.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-4cd382ae.1b39466c.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-5f27b7a4.a40147c0.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-65e8ef44.6317e831.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-6b5a3656.437990c3.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-7928e9ed.efff3bcb.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-796397fe.1f715de3.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-de4284e0.c9f8ba74.js


+ 5 - 5
ghs/src/mock/userInfo.js
View File 

@@ -165,11 +165,6 @@ let menu = {
 
 		{id: '312',parentId: 3,name: '走播单',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/live-list',viewPath: 'views/order/live-list.vue',keepAlive: 1},
 
 		{id: '309',parentId: 3,name: '开走播单',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/add-live',viewPath: 'views/order/add-live.vue',keepAlive: 1},
 
 
-		{id: '15',parentId: null,name: '供货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 
-		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 
-		{id: '1509',parentId: 15,name: '供货业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
 
-		{id: '1515',parentId: 15,name: '应付统计',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},
 
-
 
 		{id: '1400',parentId: null,name: '采购',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 
 		{id: '1405',parentId: 1400,name: '采购记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 
 		{id: '1415',parentId: 1400,name: '采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.vue',keepAlive: 1},
 
@@ -177,6 +172,11 @@ let menu = {
 
 		{id: '1430',parentId: 1400,name: '售后记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/refund-list',viewPath: 'views/in/refund-list.vue',keepAlive: 1},
 
 		{id: '1420',parentId: 1400,name: '入库改价',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/change',viewPath: 'views/in/change.vue',keepAlive: 1},
 
 
+		{id: '15',parentId: null,name: '供货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 
+		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 
+		{id: '1509',parentId: 15,name: '供货业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
 
+		{id: '1515',parentId: 15,name: '应付统计',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},
 
+
 
 		{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: '403',	parentId: '4',name: '改价改数',type: 1,icon: 'icon-user',orderNum: 4,router: '/item/batch-modify',viewPath: 'views/item/batch-modify.vue',keepAlive: 1},

+ 7 - 0
ghs/src/service/order-item/index.js
View File 

@@ -36,5 +36,12 @@ export class OrderItemService extends BaseService {
 
 		});
 
 	}
 
 
+	getDownExcel(data) {
 
+		return this.request({
 
+		  url: '/get-down-excel',
 
+		  params: data
 
+		});
 
+	}
 
+
 
 }
 
 export default new OrderItemService();

+ 7 - 0
ghs/src/service/purchase-order-item/index.js
View File 

@@ -17,5 +17,12 @@ export class PurchaseOrderService extends BaseService {
 
 		});
 
 	}
 
 
+	getDownExcel(data) {
 
+		return this.request({
 
+		  url: '/get-down-excel',
 
+		  params: data
 
+		});
 
+	}
 
+
 
 }
 
 export default new PurchaseOrderService();

+ 13 - 4
ghs/src/views/in/add.vue
View File 

@@ -28,7 +28,7 @@
 
 			<template #slot-column-option="{scope}">
 
 
 				<el-upload class="upload-demo" style="display: inline-block;margin-right:20px;" :action="`${fileUrl}?id=${scope.row.id}`" :headers="{ token: token }" multiple :show-file-list="false" :on-success="fileUpSuccess" accept=".xls,.xlsx" :limit="1">
 
-  					<el-button size="small" type="primary">导入采购</el-button>
 
+  					<el-button size="small" type="primary">导入Excel</el-button>
 
 				</el-upload>
 
 
 				<el-button size="small" type="primary" @click="goCg(scope.row)" style="margin-left:30px;">新增采购</el-button>
 
@@ -75,18 +75,27 @@ export default {
 
 		...mapGetters(['token'])
 
 	},
 
 	created() {
 
-		this.fileUrl = baseUrl+'/upload/import-cg'
 
+		this.fileUrl = baseUrl+'/purchase-order/import-create'
 
 		this.getLevel();
 
 	},
 
 	mounted() {
 
-
 
 		this.$nextTick(() => {
 
       		this.$refs.ghsSearchRef.focus()
 
     	})
 
-
 
 	},
 
 	methods: {
 
 		...mapActions(['getLevel']),
 
+		fileUpSuccess(response){
 
+			if(response.code == 1){
 
+				this.$notify({ title: '提交成功', message: 'success', type: 'success'})
 
+				let that = this
 
+				setTimeout(() => {
 
+					that.$router.push({path:'/in/list'})	
+				}, 1000)
 
+			}else{
 
+				this.$message.error(response.msg)
 
+			}
 
+		},
 
 		modifyLocation(info){
 
 			let that = this
 
 			that.$confirm('确认修改类型？', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {

+ 12 - 4
ghs/src/views/in/list.vue
View File 

@@ -105,8 +105,9 @@
 
           <el-button size="small" v-if="scope.row.status == 5 || scope.row.status == 1">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
 
           <el-button type="primary" size="small" v-else>更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
 
           <el-dropdown-menu slot="dropdown">
 
-            <el-dropdown-item command="refundRecord">售后记录</el-dropdown-item>
 
-            <el-dropdown-item command="cancel">取消</el-dropdown-item>
 
+            <el-dropdown-item command="refundShowRecord">售后记录</el-dropdown-item>
 
+            <el-dropdown-item command="downExcel">下载excel</el-dropdown-item>
 
+            <el-dropdown-item command="cancelCurrentOrder">取消</el-dropdown-item>
 
           </el-dropdown-menu>
 
         </el-dropdown>
 
 
@@ -250,15 +251,22 @@ export default {
 
 	},
 
   methods: {
 
     doMore(cmd,data){
 
-      if(cmd == 'cancel'){
 
+      if(cmd == 'cancelCurrentOrder'){
 
         this.cancelOrder(data)
 
       }
 
-      if(cmd == 'refundRecord'){
 
+      if(cmd == 'refundShowRecord'){
 
         this.refundRecordData = data
 
         setTimeout(() => {
 
           this.$refs.refundRecordRef.init()
 
         })
 
       }
 
+      if(cmd == 'downExcel'){
 
+        this.$service.purchaseOrderItem.getDownExcel({id:data.id}).then(res => {
 
+          if(res.file){
 
+            window.location.href = res.file
 
+          }
 
+			  })
 
+      }
 
     },
 
     goRefund(data){
 
       this.currentRefundData = data

+ 12 - 4
ghs/src/views/order/add.vue
View File 

@@ -34,7 +34,7 @@
 
 			<template #slot-column-option="{scope}">
 
 
 				<el-upload class="upload-demo" style="display: inline-block;margin-right:30px;" :action="`${fileUrl}?id=${scope.row.id}`" :headers="{ token: token }" multiple :show-file-list="false" :on-success="fileUpSuccess" accept=".xls,.xlsx" :limit="1">
 
-  					<el-button size="small" type="primary">导入开单</el-button>
 
+  					<el-button size="small" type="primary">导入Excel</el-button>
 
 				</el-upload>
 
 
 				<el-button size="small" type="primary" @click="kd(scope.row,1)">开预订单</el-button>
 
@@ -91,7 +91,7 @@ export default {
 
 		...mapGetters(['token'])
 
 	},
 
 	created() {
 
-		this.fileUrl = baseUrl+'/upload/import-kd'
 
+		this.fileUrl = baseUrl+'/order/import-create'
 
 		this.getLevel();
 
 	},
 
 	mounted() {
 
@@ -103,8 +103,16 @@ export default {
 
 	},
 
 	methods: {
 
 		...mapActions(['getLevel']),
 
-		fileUpSuccess(){
 
-			this.$notify({ title: '已提交，请稍等', message: 'success', type: 'success'})
 
+		fileUpSuccess(response){
 
+			if(response.code == 1){
 
+				this.$notify({ title: '提交成功', message: 'success', type: 'success'})
 
+				let that = this
 
+				setTimeout(() => {
 
+					that.$router.push({path:'/order/list'})	
+				}, 1000)
 
+			}else{
 
+				this.$message.error(response.msg)
 
+			}
 
 		},
 
 		changeText(){
 
 			this.app.refresh({ type: this.tabIndex,name:this.name })

+ 1 - 3
ghs/src/views/order/list.vue
View File 

@@ -466,9 +466,7 @@ export default {
 
         })
 
       }
 
       if(cmd == 'downExcel'){
 
-        this.$message.error('开发中')
 
-        return false
 
-        this.$service.customBalanceChange.getChangeList({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,customId:this.customId,pageSize:9999999,export:1}).then(res => {
 
+        this.$service.orderItem.getDownExcel({id:info.id}).then(res => {
 
           if(res.file){
 
             window.location.href = res.file
 
           }

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

@@ -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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><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,
 
+<!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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><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,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.906bf484.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.2ff8f1e7.js" rel="preload" as="script"><link href="/js/chunk-libs.fc22e634.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.906bf484.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.fc22e634.js"></script><script src="/js/app.2ff8f1e7.js"></script></body></html>
 
+			}</style><link href="/css/app.906bf484.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.963739b6.js" rel="preload" as="script"><link href="/js/chunk-libs.fc22e634.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.906bf484.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.fc22e634.js"></script><script src="/js/app.963739b6.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/app.963739b6.js


+ 1 - 1
hdApp/dist/build/h5/index.html
View File 

@@ -1,3 +1,3 @@
 
 <!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>花掌柜</title><script>document.addEventListener('DOMContentLoaded', function() {
 
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 
-			})</script><link rel="stylesheet" href="/static/index.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script><script src="/static/js/chunk-vendors.9240bb17.js"></script><script src="/static/js/index.1d2edf49.js"></script></body></html>
 
+			})</script><link rel="stylesheet" href="/static/index.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script><script src="/static/js/chunk-vendors.9240bb17.js"></script><script src="/static/js/index.4bc77d70.js"></script></body></html>

+ 6 - 6
hdApp/dist/build/h5/static/iconfont/iconfont.css
View File 

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

File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/h5/static/js/index.1d2edf49.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/h5/static/js/index.4bc77d70.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/h5/static/js/pagesPurchase-readMe.05deab57.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/h5/static/js/pagesPurchase-readMe.90e417a2.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/h5/static/js/pagesPurchase-xj.010a14b7.js


File diff suppressed because it is too large
+ 0 - 0
hdApp/dist/build/h5/static/js/pagesPurchase-xj.1850fa2d.js


+ 1 - 1
mallApp/dist/build/h5/index.html
View File 

@@ -1,3 +1,3 @@
 
 <!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
 
-			})</script><link rel="stylesheet" href="/static/index.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script><script src="/static/js/chunk-vendors.5c9f19e2.js"></script><script src="/static/js/index.fb9c522b.js"></script></body></html>
 
+			})</script><link rel="stylesheet" href="/static/index.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script>/*BAIDU_STAT*/</script><script src="/static/js/chunk-vendors.5c9f19e2.js"></script><script src="/static/js/index.ceafa4d7.js"></script></body></html>

+ 6 - 6
mallApp/dist/build/h5/static/iconfont/iconfont.css
View File 

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

File diff suppressed because it is too large
+ 0 - 0
mallApp/dist/build/h5/static/js/index.ceafa4d7.js


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

@@ -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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><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,
 
+<!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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>花卉宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.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.906bf484.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.42757863.js" rel="preload" as="script"><link href="/js/chunk-libs.26078914.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.906bf484.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.26078914.js"></script><script src="/js/app.42757863.js"></script></body></html>
 
+			}</style><link href="/css/app.906bf484.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.1a16acf5.js" rel="preload" as="script"><link href="/js/chunk-libs.26078914.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.906bf484.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="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.26078914.js"></script><script src="/js/app.1a16acf5.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/app.1a16acf5.js


Some files were not shown because too many files changed in this diff