shish il y a 11 mois
Parent
commit
2c42db5788

+ 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.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="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,
 			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.8a0d15a7.js" rel="preload" as="script"><link href="/js/chunk-libs.ae2a8b3d.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.ae2a8b3d.js"></script><script src="/js/app.8a0d15a7.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.c5eb45fd.js" rel="preload" as="script"><link href="/js/chunk-libs.ae2a8b3d.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.ae2a8b3d.js"></script><script src="/js/app.c5eb45fd.js"></script></body></html>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
ghs/dist/shop/js/app.c5eb45fd.js


+ 221 - 0
hdh5/admin/clear/alipay.vue

@@ -0,0 +1,221 @@
+<template>
+	<div class="app-content pay-wrap">
+		<div class="delivery-wrap">
+			<div class="btn-wrap">
+				<!-- #ifdef H5 -->
+				<button class="button-com red" @click="go()" v-if="hasRenew == 1">正在打开支付宝...</button>
+				<view style="margin-top:50upx;font-size:40upx;font-weight:bold;text-align: center;" v-if="hasRenew == 0">商家还未开通此功能</view>
+				<!-- #endif -->
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+import { purchaseClearAliPay } from '@/api/purchase'
+export default {
+    name: 'alipay',
+    components: {
+    },
+    mixins: [],
+    data() {
+        return {
+			payUrl:'',
+			hasRenew:1
+        }
+    },
+    computed: {
+    },
+    onLoad(options) {
+        let orderSn = options.orderSn ? options.orderSn:''
+        this.payInit(orderSn)
+    },
+    mounted() {},
+    methods: {
+        init(){
+
+        },
+		go(){
+			if(this.hasRenew == 1){
+				window.location.href = this.payUrl
+			}
+		},
+        payInit(orderSn) {
+            if (orderSn==''){
+                uni.showToast({title: '没有找到订单号',icon: 'none',duration: 1500})
+                return false
+            }
+            purchaseClearAliPay({orderSn:orderSn}).then(res=>{
+                if(res.code == 0){
+                    uni.showToast({title: res.msg,icon: 'none',duration: 1500})
+                    return false
+                }
+				this.hasRenew = res.data.hasRenew?res.data.hasRenew:0
+				if(res.data.hasRenew && res.data.hasRenew == 1){
+					this.payUrl = res.data.payUrl
+					window.location.href = this.payUrl
+				}
+            })
+        }
+    }
+}
+</script>
+<style lang="scss">
+	.app-content {
+		min-height: calc(100vh - 20upx);
+		padding-top: 20upx;
+	}
+	.tabs-wrap {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 80upx;
+		line-height: 80upx;
+		text-align: center;
+		background-color: #fff;
+		font-size: 30upx;
+		box-shadow: 4upx 4upx 10upx #eee;
+	}
+	.pay-wrap {
+		.pay-input-wrap {
+			background-color: #fff;
+			border-top-left-radius: 20upx;
+			border-top-right-radius: 20upx;
+			padding: 50upx 80upx 28upx;
+			margin-bottom: 0 !important;
+			.balance {
+				margin-top: 30upx;
+				color: #666666;
+			}
+			.btn-wrap {
+				width: 100%;
+				margin-top: 64upx;
+				.button-com {
+					display: block;
+					margin-bottom: 20upx;
+					padding-top: 30upx;
+					padding-bottom: 30upx;
+				}
+			}
+		}
+	}
+
+	// 我要配送
+	.delivery-wrap {
+		.module-com {
+			margin-bottom: 20upx;
+			background-color: #fff;
+			.module-tit {
+				padding: 20upx 18upx;
+				font-size: 28upx;
+				font-weight: 600;
+				border-bottom: 1upx solid #eee;
+			}
+			.module-det {
+				padding: 0 30upx;
+			}
+		}
+		// 金额
+		.pay-input-wrap {
+			padding: 50upx 36upx 38upx;
+			.balance {
+				margin-top: 30upx;
+				color: #666666;
+			}
+		}
+		.shop-logo-wrap {
+			padding-bottom: 20upx;
+			.logo-img {
+				width: 100%;
+				margin: 10upx auto;
+				align-items: center;
+				.logo {
+					width: 100upx;
+					height:100upx;
+					border-radius: 10upx;
+					margin-left:10upx;
+					float: left;
+				}
+				.title{
+					margin-left:20upx;
+					float:left;
+					width:600upx;
+					height:100upx;
+					line-height:100upx;
+					font-size:38upx;
+					font-weight: bold;
+				}
+			}
+		}
+		// 可选优惠
+		.discount-wrap {
+			.module-det {
+				padding-top: 20upx;
+				padding-bottom: 20upx;
+			}
+		}
+		// 匿名派送
+		.none-name-delivery {
+			// padding-left: 30upx;
+			padding: 26upx 30upx;
+			// margin-top: 40upx;
+			margin-bottom: 20upx;
+			background-color: #fff;
+			.none-name-text {
+				margin-left: 14upx;
+				color: #666666;
+			}
+		}
+		// 按钮
+		.btn-wrap {
+			width: calc(100% - 60upx);
+			margin: 64upx auto 0;
+			padding-bottom: 20upx;
+			.button-com {
+				display: block;
+				margin-bottom: 20upx;
+				padding-top: 30upx;
+				padding-bottom: 30upx;
+				&:last-child {
+					margin-bottom: 0;
+				}
+			}
+		}
+
+		// 查看更多
+		.view-more {
+			width: auto;
+			padding-bottom: 20upx;
+			margin-bottom: 20upx;
+			font-size: 28upx;
+			background-color: #fff;
+			color: #666565;
+			justify-content: flex-start;
+			z-index:9999999;
+			.view-more-text {
+				margin-right: 14upx;
+			}
+			padding-left:40upx;
+			i {
+				font-size: 30upx;
+				font-weight: 600;
+			}
+			.fill-get-man{
+				color:red;
+				margin-left:10upx;
+				font-weight:600;
+				text-decoration:underline;
+			}
+			.pack-up{
+				margin-left:20upx;
+				font-weight:600;
+				color:red;
+				text-decoration:underline;
+			}
+			&.open {
+				i {
+					transform: rotate(180deg);
+				}
+			}
+		}
+	}
+</style>

+ 4 - 0
hdh5/api/purchase/index.js

@@ -2,4 +2,8 @@ import https from '@/plugins/luch-request_0.0.7/request'
 
 export const purchaseAliPay = async data => {
     return https.post("/purchase/ali-pay", data);
+};
+
+export const purchaseClearAliPay = async data => {
+    return https.post("/purchase-clear/ali-pay", data);
 };

+ 10 - 1
hdh5/pages.json

@@ -29,8 +29,17 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "admin/clear/alipay",
+			"style": {
+				"navigationBarTitleText": "支付",
+				"navigationStyle": "custom",
+				"h5": {
+					"titleNView": false
+				}
+			}
 		}
-
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 1 - 0
hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.DkmIZX8o.js

@@ -0,0 +1 @@
+import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,a as p}from"./index-Bb2Jwa40.js";import{p as l}from"./index.BDvbWad8.js";import{_ as h}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./request.Dp23h_JP.js";const c=h({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,h,c,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{c as default};

+ 0 - 1
hdh5/unpackage/dist/build/web/assets/admin-cg-alipay.Dtgg35JW.js

@@ -1 +0,0 @@
-import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,a as p}from"./index-Dp4LxvPU.js";import{h as l}from"./request.D9xsoVJ_.js";import{_ as h}from"./_plugin-vue_export-helper.BCo6x5W8.js";const c=h({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;(async a=>l.post("/purchase/ali-pay",a))({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,h,c,u,w){const m=i,y=r;return d(),e("div",{class:"app-content pay-wrap"},[t("div",{class:"delivery-wrap"},[t("div",{class:"btn-wrap"},[1==u.hasRenew?(d(),n(m,{key:0,class:"button-com red",onClick:l[0]||(l[0]=a=>w.go())},{default:s((()=>[p("正在打开支付宝...")])),_:1})):o("",!0),0==u.hasRenew?(d(),n(y,{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{c as default};

+ 1 - 0
hdh5/unpackage/dist/build/web/assets/admin-clear-alipay.CP2mc28X.js

@@ -0,0 +1 @@
+import{s as a,f as e,l as t,c as n,w as s,e as o,k as i,i as r,o as d,a as p}from"./index-Bb2Jwa40.js";import{a as l}from"./index.BDvbWad8.js";import{_ as c}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./request.Dp23h_JP.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};

+ 1 - 1
mallh5/unpackage/dist/build/web/assets/pages-pay-demo.C1-24r4p.js → hdh5/unpackage/dist/build/web/assets/admin-ghs-index.bwgImLbA.js

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-DJzkx5zs.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-Bb2Jwa40.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};

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/admin-ghs-pay.CGzwTjc1.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/alipay-D77sGShL.css


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
hdh5/unpackage/dist/build/web/assets/index-Bb2Jwa40.js


+ 1 - 0
hdh5/unpackage/dist/build/web/assets/index.BDvbWad8.js

@@ -0,0 +1 @@
+import{h as a}from"./request.Dp23h_JP.js";const s=async s=>a.post("/purchase/ali-pay",s),p=async s=>a.post("/purchase-clear/ali-pay",s);export{p as a,s as p};

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/request.D9xsoVJ_.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
hdh5/unpackage/dist/build/web/assets/request.Dp23h_JP.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-Dp4LxvPU.js"></script>
+    <script type="module" crossorigin src="/assets/index-Bb2Jwa40.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
mallh5/unpackage/dist/build/web/assets/index-BeAzKEzg.js


+ 1 - 1
hdh5/unpackage/dist/build/web/assets/admin-ghs-index.86Mo4FnO.js → mallh5/unpackage/dist/build/web/assets/pages-pay-demo.DQtisBjK.js

@@ -1 +1 @@
-import{c as e,w as a,i as o,o as t,a as n}from"./index-Dp4LxvPU.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-BeAzKEzg.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};

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-index.CXh9kgwY.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
mallh5/unpackage/dist/build/web/assets/pages-pay-success.CFwrf0QN.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-DJzkx5zs.js"></script>
+    <script type="module" crossorigin src="/assets/index-BeAzKEzg.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Dzn8UyOo.css">
   </head>
   <body>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff