صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
zhh
/
front-end
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

Merge branch 'master' into redesign‌-260706

shish 5 روز پیش
والد
d04da179a5 602c09a538
کامیت
f907f1591d
28فایلهای تغییر یافته به همراه55 افزوده شده و 26 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 2 2
      ghs/dist/shop/index.html
  2. 0 0
      ghs/dist/shop/js/app.9c3dba4c.js
  3. 2 2
      ghsApp/src/manifest.json
  4. 2 2
      hd/dist/shop/index.html
  5. 0 0
      hd/dist/shop/js/app.bf88ca96.js
  6. 34 5
      hdApp/src/pagesPurchase/ghsProduct.vue
  7. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DdMvIptU.js
  8. 0 0
      hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.H6AekIpX.js
  9. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.N9IqAwYO.js
  10. 1 1
      hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.rS9y61zB.js
  11. 0 0
      hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.IflcH4VK.js
  12. 1 1
      hdh5/unpackage/dist/build/web/assets/index-CS1sLqOC.js
  13. 1 1
      hdh5/unpackage/dist/build/web/assets/index.CDovZGC1.js
  14. 0 0
      hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.urUf1h8Y.js
  15. 1 1
      hdh5/unpackage/dist/build/web/index.html
  16. 1 1
      mallh5/unpackage/dist/build/web/assets/index-BhxOCqMw.js
  17. 1 1
      mallh5/unpackage/dist/build/web/assets/pages-pay-demo.jXX3xtpy.js
  18. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-index.DBqKiGL9.js
  19. 0 0
      mallh5/unpackage/dist/build/web/assets/pages-pay-success.CShz71ar.js
  20. 1 1
      mallh5/unpackage/dist/build/web/index.html
  21. 2 2
      pt/dist/web/index.html
  22. 0 0
      pt/dist/web/js/app.d3e25896.js
  23. 0 0
      pt/dist/web/js/chunk-205a2464.51e21268.js
  24. 0 0
      pt/dist/web/js/chunk-205a2464.e2e12840.js
  25. 0 0
      pt/dist/web/js/chunk-2d22502b.dd5650e8.js
  26. 1 1
      开发http/ghsApp/src/manifest.json
  27. 2 2
      开发https/ghsApp/src/manifest.json
  28. 2 2
      线上/ghsApp/src/manifest.json

+ 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"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><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"><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,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.03cfa881.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.9f5fa3e6.js" rel="preload" as="script"><link href="/js/chunk-libs.344d2dbf.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.03cfa881.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.344d2dbf.js"></script><script src="/js/app.9f5fa3e6.js"></script></body></html>
 
+			}</style><link href="/css/app.03cfa881.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.9c3dba4c.js" rel="preload" as="script"><link href="/js/chunk-libs.344d2dbf.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.03cfa881.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.344d2dbf.js"></script><script src="/js/app.9c3dba4c.js"></script></body></html>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
ghs/dist/shop/js/app.9c3dba4c.js


+ 2 - 2
ghsApp/src/manifest.json
مشاهده فایل 

@@ -2,8 +2,8 @@
 
     "name" : "销花宝",
 
     "appid" : "__UNI__BD781B0",
 
     "description" : "鲜花批发销售管理系统",
 
-    "versionName" : "1.3.19",
 
-    "versionCode" : 1319,
 
+    "versionName" : "1.3.20",
 
+    "versionCode" : 1320,
 
     "transformPx" : true,
 
     /* 5+App特有相关 */
 
     "app-plus" : {

+ 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"><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,
 
+<!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,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.6156a144.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.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.7289eda9.js"></script><script src="/js/app.6156a144.js"></script></body></html>
 
+			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.bf88ca96.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.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.7289eda9.js"></script><script src="/js/app.bf88ca96.js"></script></body></html>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
hd/dist/shop/js/app.bf88ca96.js


+ 34 - 5
hdApp/src/pagesPurchase/ghsProduct.vue
مشاهده فایل 

@@ -37,15 +37,15 @@
 
 		</view>
 
 
 		<view class="input-wrap" >
 
-			<view style="padding:0upx 0upx 0upx 0upx;margin-right:10upx;" >
 
-				<button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
 
+			<view class="header-action-wrap header-action-wrap--left">
 
+				<button class="admin-button-com blue header-action-btn" @click="selectFlowerNumFn()">图片分类</button>
 
 			</view>
 
 			<view class="search-bar">
 
 				<app-search-module v-model="py" placeholder="最少输二到三字搜索" placeholder-color="red" @input="goSearchFn" />
 
 			</view>
 
-			<view style="padding:0 0upx 0 20upx;" >
 
-				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:#09C567;border:1upx solid #09C567;" @click="aheadCg(ghsInfo)">预订花材</button>
 
-				<button class="admin-button-com middle blue" v-else @click="delMemory()" style="background-color: red;border:1upx solid red;">清空购物车</button>
 
+			<view class="header-action-wrap header-action-wrap--right">
 
+				<button class="admin-button-com blue header-action-btn header-action-btn--presell" v-if="ghsInfo.presell && ghsInfo.presell == 1" @click="aheadCg(ghsInfo)">预订花材</button>
 
+				<button class="admin-button-com blue header-action-btn header-action-btn--clear" v-else @click="delMemory()">清空已选</button>
 
 			</view>
 
 		</view>
 
 
@@ -969,9 +969,38 @@ export default {
 
   }
 
 	.input-wrap {
 
 		display: flex;
 
+		align-items: center;
 
 		padding: 18upx 20upx 22upx 13upx;
 
 		.search-bar {
 
 			flex: 1;
 
+			min-width: 0;
 
+		}
 
+	}
 
+	.header-action-wrap {
 
+		flex-shrink: 0;
 
+		&--left {
 
+			margin-right: 10upx;
 
+		}
 
+		&--right {
 
+			padding-left: 20upx;
 
+		}
 
+	}
 
+	/* 与搜索框 map-search 同高 90upx，去掉 middle 上下 padding，文字水平垂直居中 */
 
+	.header-action-btn {
 
+		height: 90upx;
 
+		line-height: 90upx;
 
+		padding: 0 16upx;
 
+		margin: 0;
 
+		box-sizing: border-box;
 
+		text-align: center;
 
+		font-size: 26upx;
 
+		&--presell {
 
+			background-color: #09C567;
 
+			border: 1upx solid #09C567;
 
+		}
 
+		&--clear {
 
+			background-color: red;
 
+			border: 1upx solid red;
 
 		}
 
 	}
 
 	.scroll-middle_bx {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.DdMvIptU.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/_plugin-vue_export-helper.H6AekIpX.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.M1j2sHeV.js → hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.N9IqAwYO.js
مشاهده فایل 

@@ -1 +1 @@
 
-import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-BJqnDxhV.js";import{c as l}from"./index.BSVTUOaP.js";import{_ as c}from"./_plugin-vue_export-helper.DdMvIptU.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{h as default};
 
+import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-CS1sLqOC.js";import{c as l}from"./index.CDovZGC1.js";import{_ as c}from"./_plugin-vue_export-helper.H6AekIpX.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单编号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-1045a385"]]);export{h as default};

+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.adkZ4lWZ.js → hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.rS9y61zB.js
مشاهده فایل 

@@ -1 +1 @@
 
-import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-BJqnDxhV.js";import{b as l}from"./index.BSVTUOaP.js";import{_ as c}from"./_plugin-vue_export-helper.DdMvIptU.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};
 
+import{s as a,f as e,q as t,c as n,w as s,e as o,k as i,i as r,o as d,d as p}from"./index-CS1sLqOC.js";import{b as l}from"./index.CDovZGC1.js";import{_ as c}from"./_plugin-vue_export-helper.H6AekIpX.js";const h=c({name:"alipay",components:{},mixins:[],data:()=>({payUrl:"",hasRenew:1}),computed:{},onLoad(a){let e=a.orderSn?a.orderSn:"";this.payInit(e)},mounted(){},methods:{init(){},go(){1==this.hasRenew&&(window.location.href=this.payUrl)},payInit(e){if(""==e)return a({title:"没有找到订单号",icon:"none",duration:1500}),!1;l({orderSn:e}).then((e=>{if(0==e.code)return a({title:e.msg,icon:"none",duration:1500}),!1;this.hasRenew=e.data.hasRenew?e.data.hasRenew:0,e.data.hasRenew&&1==e.data.hasRenew&&(this.payUrl=e.data.payUrl,window.location.href=this.payUrl)}))}}},[["render",function(a,l,c,h,w,u){const m=i,f=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==w.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>u.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==w.hasRenew?(d(),n(f,{key:1,style:{"margin-top":"50upx","font-size":"40upx","font-weight":"bold","text-align":"center"}},{default:s((()=>[p("商家还未开通此功能")])),_:1})):o("",!0)])])])}],["__scopeId","data-v-12a9cc21"]]);export{h as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.IflcH4VK.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-CS1sLqOC.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index.BSVTUOaP.js → hdh5/unpackage/dist/build/web/assets/index.CDovZGC1.js
مشاهده فایل 

@@ -1 +1 @@
 
-import{h as a}from"./_plugin-vue_export-helper.DdMvIptU.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};
 
+import{h as a}from"./_plugin-vue_export-helper.H6AekIpX.js";const s=async s=>a.post("/purchase/ali-pay",s),e=async s=>a.post("/purchase-clear/ali-pay",s),p=async s=>a.get("/purchase/debt-list",s),c=async s=>a.get("/ghs/detail",s),r=async s=>a.post("/purchase-clear/create-order",s);export{r as a,e as b,s as c,c as g,p};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/pagesPurchase-gathering.urUf1h8Y.js


+ 1 - 1
hdh5/unpackage/dist/build/web/index.html
مشاهده فایل 

@@ -16,7 +16,7 @@
 
 	<script src="/static/web/quill-1.3.7.min.js"></script>

     <!--preload-links-->

     <!--app-context-->

-    <script type="module" crossorigin src="/assets/index-BJqnDxhV.js"></script>
 
+    <script type="module" crossorigin src="/assets/index-CS1sLqOC.js"></script>
 
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
 
   </head>

   <body>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-BhxOCqMw.js


+ 1 - 1
mallh5/unpackage/dist/build/web/assets/pages-pay-demo.TyNY5I7J.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.jXX3xtpy.js
مشاهده فایل 

@@ -1 +1 @@
 
-import{c as e,w as a,i as o,o as t,a as n}from"./index-B5rO03ky.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};
 
+import{c as e,w as a,i as o,o as t,a as n}from"./index-BhxOCqMw.js";import{_ as s}from"./_plugin-vue_export-helper.BCo6x5W8.js";const r=s({name:"index",data:()=>({}),computed:{},onLoad(e){},methods:{}},[["render",function(s,r,d,u,i,m){const p=o;return t(),e(p,null,{default:a((()=>[n(" 您好 ")])),_:1})}]]);export{r as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-index.DBqKiGL9.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.CShz71ar.js


+ 1 - 1
mallh5/unpackage/dist/build/web/index.html
مشاهده فایل 

@@ -16,7 +16,7 @@
 
 	<script src="/static/web/quill-1.3.7.min.js"></script>

     <!--preload-links-->

     <!--app-context-->

-    <script type="module" crossorigin src="/assets/index-B5rO03ky.js"></script>
 
+    <script type="module" crossorigin src="/assets/index-BhxOCqMw.js"></script>
 
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
 
   </head>

   <body>

+ 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"><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,
 
+<!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,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.a18bd3d5.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.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.7289eda9.js"></script><script src="/js/app.a18bd3d5.js"></script></body></html>
 
+			}</style><link href="/css/app.97b5310c.css" rel="preload" as="style"><link href="/css/chunk-libs.b57e4bfb.css" rel="preload" as="style"><link href="/js/app.d3e25896.js" rel="preload" as="script"><link href="/js/chunk-libs.7289eda9.js" rel="preload" as="script"><link href="/css/chunk-libs.b57e4bfb.css" rel="stylesheet"><link href="/css/app.97b5310c.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.7289eda9.js"></script><script src="/js/app.d3e25896.js"></script></body></html>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/app.d3e25896.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-205a2464.51e21268.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-205a2464.e2e12840.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
pt/dist/web/js/chunk-2d22502b.dd5650e8.js


+ 1 - 1
开发http/ghsApp/src/manifest.json
مشاهده فایل 

@@ -3,7 +3,7 @@
 
     "appid" : "__UNI__BD781B0",
 
     "description" : "鲜花批发销售管理系统",
 
     "versionName" : "1.3.18",
 
-    "versionCode" : 1319,
 
+    "versionCode" : 1320,
 
     "transformPx" : true,
 
     /* 5+App特有相关 */
 
     "app-plus" : {

+ 2 - 2
开发https/ghsApp/src/manifest.json
مشاهده فایل 

@@ -2,8 +2,8 @@
 
     "name" : "销花宝",
 
     "appid" : "__UNI__BD781B0",
 
     "description" : "鲜花批发销售管理系统",
 
-    "versionName" : "1.3.19",
 
-    "versionCode" : 1319,
 
+    "versionName" : "1.3.20",
 
+    "versionCode" : 1320,
 
     "transformPx" : true,
 
     /* 5+App特有相关 */
 
     "app-plus" : {

+ 2 - 2
线上/ghsApp/src/manifest.json
مشاهده فایل 

@@ -2,8 +2,8 @@
 
     "name" : "销花宝",
 
     "appid" : "__UNI__BD781B0",
 
     "description" : "鲜花批发销售管理系统",
 
-    "versionName" : "1.3.19",
 
-    "versionCode" : 1319,
 
+    "versionName" : "1.3.20",
 
+    "versionCode" : 1320,
 
     "transformPx" : true,
 
     /* 5+App特有相关 */
 
     "app-plus" : {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است