Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

common/styles/common.css

@@ -21,8 +21,8 @@ checkbox .uni-checkbox-input {
 radio .uni-radio-input.uni-radio-input-checked,
 checkbox .uni-checkbox-input.uni-checkbox-input-checked {
 	/* border-radius: 50%; */
-	border: 1px solid #FF4B48 !important;
-	background: #FF4B48 !important;
+	border: 1px solid #FE9903 !important;
+	background: #FE9903 !important;
 	color: #FFFFFF !important;
 }
 
@@ -47,8 +47,8 @@ checkbox .wx-checkbox-input {
 radio .wx-radio-input.wx-radio-input-checked,
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
 	border-radius: 50%;
-	border: 1px solid #FF4B48 !important;
-	background: #FF4B48 !important;
+	border: 1px solid #FE9903 !important;
+	background: #FE9903 !important;
 	color: #FFFFFF !important;
 }
 

package-lock.json

@@ -35,11 +35,6 @@
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
-    "tki-qrcode": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/tki-qrcode/-/tki-qrcode-0.1.6.tgz",
-      "integrity": "sha512-EnnlS8psowC7PsW3MDYcxvJYkuklX3WAZ/BYanR4TdBHTu74GfjTBX8Y16REP+AeDENiVtBPh4jtTRL2P736hQ=="
-    },
     "vue-clipboard2": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",

pages/login/index.vue

@@ -2,12 +2,23 @@
 	<view>
 		<view class="lf-row-center lf-flex-column box">
 			<image class="img"></image>
-			<view>游客jdsfbuskdnko</view>
+			<view class="lf-m-t-10 lf-font-32">游客jdsfbuskdnko</view>
 			<button class="btn">
-				<u-icon name="weixin-fill" color="#ffffff"></u-icon>
-				<text>绑定微信</text>
+				<u-icon name="weixin-fill" color="#ffffff" size="60" class="lf-text-vertical"></u-icon>
+				<text class="lf-m-l-20">绑定微信</text>
 			</button>
-			<view>暂不绑定继续操作</view>
+			<view class="lf-m-t-40 lf-font-28">暂不绑定继续操作</view>
+		</view>
+		<!-- 服务条款 -->
+		<view class="fixed-bottom">
+			<checkbox class="lf-text-vertical" :checked="checked"></checkbox>
+			<text class="lf-m-l-10 lf-font-24 lf-color-gray">
+				<text>请认真阅读并同意</text>
+				<text class="highlight" @click="enterAgree">《时空网协议》</text>
+				<text>，在小程序下单购买即表示您已默认同意</text>
+				<text class="highlight" @click="enterAgree">《时空网协议》</text>
+				<text>的所有条款。</text>
+			</text>
 		</view>
 	</view>
 </template>
@@ -16,7 +27,7 @@
 	export default {
 		data(){
 			return {
-				
+				checked: true
 			}
 		},
 		onLoad(){
@@ -28,11 +39,41 @@
 	}
 </script>
 
+<style>
+	page{
+		overflow: hidden;
+	}
+</style>
 <style lang="scss" scoped="scoped">
 	.box{
 		padding: 60rpx 32rpx;
 		width: 750rpx;
 		height: auto;
 		box-sizing: border-box;
+		.img{
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 50%;
+			background-color: #EEEEEE;
+		}
+		.btn{
+			background-color: #09BB07;
+			color: #FFFFFF;
+			width: 100%;
+			height: 88rpx;
+			border-radius: 42rpx;
+			font-size: 32rpx;
+			line-height: 88rpx;
+			margin-top: 80rpx;
+		}
+	}
+	.fixed-bottom{
+		position: fixed;
+		bottom: 60rpx;
+		left: 0;
+		padding: 0 32rpx;
+		.highlight{
+			color: #1e90ff;
+		}
 	}
 </style>

pages/order/confirm-order.vue

@@ -71,7 +71,6 @@
 </template>
 
 <script>
-	import tkiQrcode from "tki-qrcode" // 二维码生成器
 	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
@@ -99,9 +98,6 @@
 				}],
 			}
 		},
-		components: {
-			tkiQrcode
-		},
 		computed: {
 			disabled() {
 				// 必须输入 邮箱和验证码 才能点击下一步