按钮

4 years ago · 909ba4edfa
--- a/addons/unishop/uniapp/uni-shop/components/upload-images.vue
+++ b/addons/unishop/uniapp/uni-shop/components/upload-images.vue
@@ -125,6 +125,8 @@ export default {
 		//删除图片
 		delImage: function(index){
 			uni.showModal({
 				cancelText:'Cancel',
 				confirmText:'OK',
 				content: '确定要放弃这张图片么？',
 				success: (confirmRes)=> {
 					if (confirmRes.confirm) {
--- a/addons/unishop/uniapp/uni-shop/main.js
+++ b/addons/unishop/uniapp/uni-shop/main.js
@@ -76,6 +76,8 @@ const checkLogin = () => {
 	return new Promise(resolve => {
 		if (Vue.prototype.$store.state.hasLogin == false) {
 			uni.showModal({
 				cancelText:'Cancel',
 				confirmText:'OK',
 				title: '温馨提示',
 				content: '你还没登录，请先登录',
 				success(res) {
--- a/addons/unishop/uniapp/uni-shop/pages/address/address.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/address/address.vue
@@ -69,6 +69,8 @@
 			async deleteAddress(id, index) {
 				let [error, res] = await uni.showModal({
 					title: '确定删除地址？',
 					cancelText:'Cancel',
 					confirmText:'OK',
 					content: this.addressList[index].address
 				})

--- a/addons/unishop/uniapp/uni-shop/pages/cart/cart.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/cart/cart.vue
@@ -201,6 +201,8 @@
 				let id = row.cart_id;
 								
 				uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
 					content: '确认删除 ' + list[index].title + '？' ,
 					success: async (e) => {
 						if (e.confirm) {
--- a/addons/unishop/uniapp/uni-shop/pages/money/pay.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/money/pay.vue
@@ -184,8 +184,8 @@
 							uni.showModal({
 								title: '提示',
 								content: '是否已支付?',
 								cancelText: '否',
 								confirmText: '是',
 								cancelText:'NO',
 								confirmText:'OK',
 								success: function(res) {
 									if (res.confirm) {
 										uni.redirectTo({
--- a/addons/unishop/uniapp/uni-shop/pages/order/order.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/order/order.vue
@@ -201,6 +201,8 @@
 			//删除订单
 			async deleteOrder(index) {
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
 					title: '确认删除订单'
 				});
 				if (res.confirm) { 
@@ -216,6 +218,8 @@
 			async cancelOrder(item) {
 				let that = this;
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
 					title: '确认取消订单',
 					content: '取消之后不可恢复',
 				});
@@ -251,6 +255,8 @@
 			async refunded(item) {
 				let that = this;
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
 					title: '确认退款',
 					content: '退款之后不可恢复',
 				});
@@ -289,6 +295,8 @@
 			async receivedOrder(item) {
 				let that = this;
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
 					title: '确认收货'
 				});
 				if (res.confirm == true) {
--- a/addons/unishop/uniapp/uni-shop/pages/set/set.vue
+++ b/addons/unishop/uniapp/uni-shop/pages/set/set.vue
@@ -31,6 +31,8 @@
 			//退出登录
 			toLogout(){
 				uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
 				    content: '确定要退出登录么',
 				    success: (e)=>{
 				    	if(e.confirm){
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html
@@ -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=/h5/static/index.css></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.5ee3084d.js></script><script src=/h5/static/js/index.ba1fc3bd.js></script></body></html>
 			})</script><link rel=stylesheet href=/h5/static/index.css></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.5ee3084d.js></script><script src=/h5/static/js/index.fa623679.js></script></body></html>
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.fa623679.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/index.fa623679.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.01fa9de6.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.01fa9de6.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.85e43404.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-address-address.85e43404.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.616f7137.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.616f7137.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.85dd04f5.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-pay.85dd04f5.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.3f64fdca.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.3f64fdca.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.f0df262f.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-order.f0df262f.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.4ab91488.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.4ab91488.js
@@ -1 +0,0 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{1433:function(t,e,a){var n=a("f510");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=a("4f06").default;i("6f9a5437",n,!0,{sourceMap:!1,shadowMode:!1})},"4b60":function(t,e,a){"use strict";var n=a("1433"),i=a.n(n);i.a},"804a":function(t,e,a){"use strict";a.r(e);var n=a("9980"),i=a.n(n);for(var l in n)"default"!==l&&function(t){a.d(e,t,(function(){return n[t]}))}(l);e["default"]=i.a},"937e":function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return i})),a.d(e,"c",(function(){return l})),a.d(e,"a",(function(){return n}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"container"},[a("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.navTo("/pages/userinfo/userinfo")}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Change Password")]),a("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),a("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.toLogout.apply(void 0,arguments)}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Sign Out")])],1)],1)},l=[]},9980:function(t,e,a){"use strict";var n=a("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n(a("5530")),l=a("2f62"),c={data:function(){return{}},methods:(0,i.default)((0,i.default)({},(0,l.mapMutations)(["logout"])),{},{navTo:function(t){uni.navigateTo({url:t})},toLogout:function(){var t=this;uni.showModal({content:"确定要退出登录么",success:function(e){e.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var e=t.detail.value?"打开":"关闭";this.$api.msg("".concat(e,"消息推送"))}})};e.default=c},a88a:function(t,e,a){"use strict";a.r(e);var n=a("937e"),i=a("804a");for(var l in i)"default"!==l&&function(t){a.d(e,t,(function(){return i[t]}))}(l);a("4b60");var c,o=a("f0c5"),s=Object(o["a"])(i["default"],n["b"],n["c"],!1,null,"6c03076c",null,!1,n["a"],c);e["default"]=s.exports},f510:function(t,e,a){var n=a("24fb");e=n(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-6c03076c]{background:#f8f8f8}.list-cell[data-v-6c03076c]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:baseline;-webkit-align-items:baseline;align-items:baseline;padding:%?20?% %?30?%;line-height:%?60?%;position:relative;background:#fff;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.list-cell.log-out-btn[data-v-6c03076c]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-6c03076c]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-6c03076c]{background:#fafafa}.list-cell.b-b[data-v-6c03076c]:after{left:%?30?%}.list-cell.m-t[data-v-6c03076c]{margin-top:%?16?%}.list-cell .cell-more[data-v-6c03076c]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-6c03076c]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-6c03076c]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-6c03076c]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-6c03076c]{background:#f8f8f8}',""]),t.exports=e}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.f26c592e.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.f26c592e.js
@@ -0,0 +1 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{"118a":function(t,a,e){"use strict";var n=e("128a"),i=e.n(n);i.a},"128a":function(t,a,e){var n=e("ccb0");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=e("4f06").default;i("8c71d8e4",n,!0,{sourceMap:!1,shadowMode:!1})},"804a":function(t,a,e){"use strict";e.r(a);var n=e("9980"),i=e.n(n);for(var l in n)"default"!==l&&function(t){e.d(a,t,(function(){return n[t]}))}(l);a["default"]=i.a},9980:function(t,a,e){"use strict";var n=e("4ea4");Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0;var i=n(e("5530")),l=e("2f62"),o={data:function(){return{}},methods:(0,i.default)((0,i.default)({},(0,l.mapMutations)(["logout"])),{},{navTo:function(t){uni.navigateTo({url:t})},toLogout:function(){var t=this;uni.showModal({cancelText:"Cancel",confirmText:"OK",content:"确定要退出登录么",success:function(a){a.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var a=t.detail.value?"打开":"关闭";this.$api.msg("".concat(a,"消息推送"))}})};a.default=o},a88a:function(t,a,e){"use strict";e.r(a);var n=e("ddc6"),i=e("804a");for(var l in i)"default"!==l&&function(t){e.d(a,t,(function(){return i[t]}))}(l);e("118a");var o,c=e("f0c5"),s=Object(c["a"])(i["default"],n["b"],n["c"],!1,null,"5354276a",null,!1,n["a"],o);a["default"]=s.exports},ccb0:function(t,a,e){var n=e("24fb");a=n(!1),a.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-5354276a]{background:#f8f8f8}.list-cell[data-v-5354276a]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:baseline;-webkit-align-items:baseline;align-items:baseline;padding:%?20?% %?30?%;line-height:%?60?%;position:relative;background:#fff;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.list-cell.log-out-btn[data-v-5354276a]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-5354276a]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-5354276a]{background:#fafafa}.list-cell.b-b[data-v-5354276a]:after{left:%?30?%}.list-cell.m-t[data-v-5354276a]{margin-top:%?16?%}.list-cell .cell-more[data-v-5354276a]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-5354276a]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-5354276a]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-5354276a]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-5354276a]{background:#f8f8f8}',""]),t.exports=a},ddc6:function(t,a,e){"use strict";var n;e.d(a,"b",(function(){return i})),e.d(a,"c",(function(){return l})),e.d(a,"a",(function(){return n}));var i=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("v-uni-view",{staticClass:"container"},[e("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.navTo("/pages/userinfo/userinfo")}}},[e("v-uni-text",{staticClass:"cell-tit"},[t._v("Change Password")]),e("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),e("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.toLogout.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"cell-tit"},[t._v("Sign Out")])],1)],1)},l=[]}}]);
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.68dba322.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.68dba322.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.cd28f133.js
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-user-user.cd28f133.js
--- a/addons/unishop/uniapp/uni-shop/unpackage/dist/dev/.automator/mp-weixin/.automator.json
+++ b/addons/unishop/uniapp/uni-shop/unpackage/dist/dev/.automator/mp-weixin/.automator.json