优化

1 year ago · 7fe7cd7999
parent c1503e9cd2
commit 7fe7cd7999
15 changed files with 14 additions and 14 deletions
--- a/components/navbar.vue
+++ b/components/navbar.vue
@ -90,10 +90,10 @@
 		methods: {
 			// 左侧返回按钮调用
 			onBack() {
-				this.$emit("onBack");
+				// this.$emit("onBack");
-				// uni.navigateBack({
+				uni.navigateBack({
-				// 		delta:1,//返回层数，2则上上页
+						delta:1,//返回层数，2则上上页
-			 //    })
+			    })
 			},
 			onBackIndex(){
--- a/pages/Setting/Setting.vue
+++ b/pages/Setting/Setting.vue
@ -28,9 +28,9 @@
 		</view>
 		<view class="agreeText">
 			<view class="link" @click="goText(1)">
-				《合之赢用户协议》
+				《用户协议》
 			</view><text>和</text><view class="link" @click="goText(2)">
-				《合之赢隐私协议》
+				《隐私协议》
 			</view>
 		</view>
 		<!-- 提示框 -->
--- a/pages/my/richText.vue
+++ b/pages/my/richText.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="richText">
-		<navbar :title="title" :isCenter="true" :back="true"></navbar>
+		<navbar :title="title" :isCenter="true" :back="true" ></navbar>
 		<u-parse :content="content" style="margin-top:45px;"></u-parse>
 	</view>
 </template>
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.216b923b.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.0ddc0def.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.0ddc0def.js
+++ b/unpackage/dist/build/h5/static/js/index.0ddc0def.js
--- a/unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.8a9c52ec.js
+++ b/unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.8a9c52ec.js
--- a/unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.ecffb320.js
+++ b/unpackage/dist/build/h5/static/js/pages-ConfirmOrder-ConfirmOrder.ecffb320.js
--- a/unpackage/dist/build/h5/static/js/pages-Setting-Setting.01629dc3.js
+++ b/unpackage/dist/build/h5/static/js/pages-Setting-Setting.01629dc3.js
--- a/unpackage/dist/build/h5/static/js/pages-Setting-Setting.c0b9d5e3.js
+++ b/unpackage/dist/build/h5/static/js/pages-Setting-Setting.c0b9d5e3.js
--- a/unpackage/dist/build/h5/static/js/pages-home-home.460060d0.js
+++ b/unpackage/dist/build/h5/static/js/pages-home-home.460060d0.js
--- a/unpackage/dist/build/h5/static/js/pages-home-home.79676a5a.js
+++ b/unpackage/dist/build/h5/static/js/pages-home-home.79676a5a.js
--- a/unpackage/dist/build/h5/static/js/pages-my-richText.2607cc03.js
+++ b/unpackage/dist/build/h5/static/js/pages-my-richText.2607cc03.js
--- a/unpackage/dist/build/h5/static/js/pages-my-richText.6d69e52b.js
+++ b/unpackage/dist/build/h5/static/js/pages-my-richText.6d69e52b.js
--- a/unpackage/dist/build/h5/static/js/pages-qianggou-productList.280bda13.js
+++ b/unpackage/dist/build/h5/static/js/pages-qianggou-productList.280bda13.js
--- a/unpackage/dist/build/h5/static/js/pages-qianggou-productList.31ef82df.js
+++ b/unpackage/dist/build/h5/static/js/pages-qianggou-productList.31ef82df.js
`@ -1,2 +1,2 @@`
	`<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') \|\| CSS.supports('top: constant(a)'))`	`<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') \|\| CSS.supports('top: constant(a)'))`
	`document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.216b923b.js></script></body></html>`	`document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.0ddc0def.js></script></body></html>`