越南

3 years ago · 8c0766b760
--- a/addons/unishop/uniapp/uni-shop/pages.json
+++ b/addons/unishop/uniapp/uni-shop/pages.json
@@ -244,6 +244,13 @@
 				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "运费模板"
 			}
 		},
 		{
 		    "path" : "pages/order/result",
 		    "style" : {
 				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "MSVENI SHOP"
 			}
 		}
    ],
 	"globalStyle": {
--- a/addons/unishop/uniapp/uni-shop/pages/order/createOrder.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/order/createOrder.vue
@@ -453,7 +453,7 @@
 					return;
 				}
 				if (!/(^0[0-9]{9}$)/.test(adres.mobile)) {
 					this.$api.msg('Số điện thoại người nhận');
 					this.$api.msg('Số điện thoại chưa đúng');
 					return;
 				}
 				if (!adres.address || !this.cityLebel) {
@@ -500,20 +500,24 @@
 				}
 				this.submitLock = true; // 提交锁
 				let apiUrl = this.flash_id == 0 ? '/order/submit' : '/flash/submitOrder';
 				this.$api.request("/order/submitbar", 'POST', data);
 				let result = await this.$api.request(apiUrl, 'POST', data);
 				if (result) {
 					this.submitLock = false; // 解除锁
 					uni.showModal({
 						showCancel: false,
 						title: 'MESSAGE',
 						confirmText: 'OK',
 						content: '    Quý khách hàng thân mến。\nBạn đã đặt hàng thành công. Bộ phận hỗ trợ của chúng tôi sẽ liên hệ bạn trong thời gian sớm nhất. ',
 						success: (res) => {
 							uni.redirectTo({
 								url: `/pages/product/product?id=${this.id}&flash=0`
 							});
 						}
 					})
 					uni.redirectTo({
 						url: `/pages/order/result?id=${this.id}&flash=0`
 					});
 					// uni.showModal({
 					// 	showCancel: false,
 					// 	title: 'MESSAGE',
 					// 	confirmText: 'OK',
 					// 	content: '    Quý khách hàng thân mến。\nBạn đã đặt hàng thành công. Bộ phận hỗ trợ của chúng tôi sẽ liên hệ bạn trong thời gian sớm nhất. ',
 					// 	success: (res) => {
 					// 		uni.redirectTo({
 					// 			url: `/pages/product/product?id=${this.id}&flash=0`
 					// 		});
 					// 	}
 					// })

 				}
 				this.submitLock = false; // 解除锁
--- a/addons/unishop/uniapp/uni-shop/pages/order/result.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/order/result.vue
@@ -0,0 +1,53 @@
 <template>
 	<div>
 		<div style="text-align: center;margin-top: 50px;">
 			<svg t="1621342646024" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18890" width="128" height="128"><path d="M512 64C264.576 64 64 264.576 64 512s200.576 448 448 448 448-200.576 448-448S759.424 64 512 64z m301.264 333.245L493.637 716.872c-0.127 0.129-0.245 0.264-0.373 0.392-12.499 12.499-28.882 18.747-45.265 18.745-16.382 0.003-32.765-6.246-45.265-18.745-0.128-0.128-0.246-0.263-0.373-0.392L210.736 525.245c-24.994-24.994-24.994-65.516 0-90.51 24.993-24.993 65.516-24.993 90.51 0L448 581.49l274.755-274.755c24.994-24.993 65.516-24.993 90.51 0 24.993 24.994 24.993 65.517-0.001 90.51z" p-id="18891" fill="#1afa29"></path></svg>
 		</div>
 		<div style="text-align: center">
 			MESSAGE
 		</div>
 		<div style="margin-top: 20px;text-align: center">
 			Quý khách hàng thân mến。Bạn đã đặt hàng thành công. Bộ phận hỗ trợ của chúng tôi sẽ liên hệ bạn trong thời gian sớm nhất.
 		</div>
 		<div @click="submit" style="width: 100%;background-color: #01aaef;color: white;text-align: center;position: fixed;bottom: 0;height:50px;line-height: 50px;">
 			OK
 		</div>
 	</div>
 </template>
 <script>
 	export default {
 		name: "ElResult",
 		data(){
 			return{
 				option:{}
 			}
 		},
 		onLoad(options) {
 			this.option = options;
 			console.log(this.option)
 		},
 		created(){

 		},
 		methods:{
 			submit(){
 				uni.redirectTo({
 					url: `/pages/product/product?id=${this.option.id}&flash=0`
 				});
 			}
 		}
 	}
 </script>

 <style scoped>
 	.success-title{
 		padding: 0.4rem;
 		font-size: 0.35rem;
 		color:#15bc83;
 	}
 	.fail-title{
 		padding: 0.4rem;
 		font-size: 0.35rem;
 		color:#f25643;
 	}
 </style>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
@@ -6,4 +6,4 @@
 		
 		  ttq.load('C2DN10AQV140ORDIK680');
 		  ttq.page();
 		}(window, document, 'ttq');</script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.99ddd405.js></script><script src=/h5/static/js/index.38cd2f45.js></script></body></html>
 		}(window, document, 'ttq');</script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.3d13fd81.js></script><script src=/h5/static/js/index.02f701c9.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/index.css
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/index.css
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.3d13fd81.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.3d13fd81.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.99ddd405.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/chunk-vendors.99ddd405.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.02f701c9.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.02f701c9.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.38cd2f45.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.38cd2f45.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.3b3d4014.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.3b3d4014.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.fb9885df.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-createOrder.fb9885df.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-result.06b8f6d6.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-result.06b8f6d6.js
@@ -0,0 +1 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-result"],{"17c9":function(t,n,i){"use strict";var e;i.d(n,"b",(function(){return o})),i.d(n,"c",(function(){return a})),i.d(n,"a",(function(){return e}));var o=function(){var t=this,n=t.$createElement,i=t._self._c||n;return i("div",[i("div",{staticStyle:{"text-align":"center","margin-top":"50px"}},[i("svg",{staticClass:"icon",attrs:{t:"1621342646024",viewBox:"0 0 1024 1024",version:"1.1",xmlns:"http://www.w3.org/2000/svg","p-id":"18890",width:"128",height:"128"}},[i("path",{attrs:{d:"M512 64C264.576 64 64 264.576 64 512s200.576 448 448 448 448-200.576 448-448S759.424 64 512 64z m301.264 333.245L493.637 716.872c-0.127 0.129-0.245 0.264-0.373 0.392-12.499 12.499-28.882 18.747-45.265 18.745-16.382 0.003-32.765-6.246-45.265-18.745-0.128-0.128-0.246-0.263-0.373-0.392L210.736 525.245c-24.994-24.994-24.994-65.516 0-90.51 24.993-24.993 65.516-24.993 90.51 0L448 581.49l274.755-274.755c24.994-24.993 65.516-24.993 90.51 0 24.993 24.994 24.993 65.517-0.001 90.51z","p-id":"18891",fill:"#1afa29"}})])]),i("div",{staticStyle:{"text-align":"center"}},[t._v("MESSAGE")]),i("div",{staticStyle:{"margin-top":"20px","text-align":"center"}},[t._v("Quý khách hàng thân mến。Bạn đã đặt hàng thành công. Bộ phận hỗ trợ của chúng tôi sẽ liên hệ bạn trong thời gian sớm nhất.")]),i("div",{staticStyle:{width:"100%","background-color":"#01aaef",color:"white","text-align":"center",position:"fixed",bottom:"0",height:"50px","line-height":"50px"},on:{click:function(n){arguments[0]=n=t.$handleEvent(n),t.submit.apply(void 0,arguments)}}},[t._v("OK")])])},a=[]},"17e1":function(t,n,i){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={name:"ElResult",data:function(){return{option:{}}},onLoad:function(t){this.option=t,console.log(this.option)},created:function(){},methods:{submit:function(){uni.redirectTo({url:"/pages/product/product?id=".concat(this.option.id,"&flash=0")})}}};n.default=e},"1f00":function(t,n,i){var e=i("24fb");n=e(!1),n.push([t.i,".success-title[data-v-29935d40]{padding:.4rem;font-size:.35rem;color:#15bc83}.fail-title[data-v-29935d40]{padding:.4rem;font-size:.35rem;color:#f25643}",""]),t.exports=n},"648a":function(t,n,i){"use strict";var e=i("bb93"),o=i.n(e);o.a},"7ead":function(t,n,i){"use strict";i.r(n);var e=i("17c9"),o=i("8cac");for(var a in o)"default"!==a&&function(t){i.d(n,t,(function(){return o[t]}))}(a);i("648a");var c,r=i("f0c5"),s=Object(r["a"])(o["default"],e["b"],e["c"],!1,null,"29935d40",null,!1,e["a"],c);n["default"]=s.exports},"8cac":function(t,n,i){"use strict";i.r(n);var e=i("17e1"),o=i.n(e);for(var a in e)"default"!==a&&function(t){i.d(n,t,(function(){return e[t]}))}(a);n["default"]=o.a},bb93:function(t,n,i){var e=i("1f00");"string"===typeof e&&(e=[[t.i,e,""]]),e.locals&&(t.exports=e.locals);var o=i("4f06").default;o("64311686",e,!0,{sourceMap:!1,shadowMode:!1})}}]);