更新

pages/store/settled/index.vue

@@ -259,14 +259,13 @@
 					</view>
 					
 					<view class="setAgCountbtn">
-						<button class="setAgCountbtna" @click="refuse">
+            <view class="border"></view>
+						<!-- <button class="setAgCountbtna" @click="refuse">
 							拒绝
-						</button>
+						</button> -->
-
+						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0" @click="agree">
-						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
+							<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
-							<text v-if="num>0">请仔细阅读协议{{num}}S</text>
+							<text v-else>同意本协议</text>
-							<text v-else>同意</text>
-
 						</button>
 					</view>
 				</view>
@@ -1503,13 +1502,13 @@ import { Toast } from '../../../libs/uniApi';
 
 	.settlementAgreement .setAgCount {
 		background: #fff;
-		width: 656rpx;
+		width: 694rpx;
 		// height: 458px;
 		position: absolute;
 		top: 50%;
 		left: 50%;
 
-		padding: 52rpx;
+		padding: 28rpx;
 		-webkit-transform: translate(-50%, -50%);
 		-moz-transform: translate(-50%, -50%);
 		transform: translate(-50%, -50%);
@@ -1573,10 +1572,11 @@ import { Toast } from '../../../libs/uniApi';
 	.setAgCountbtn {
 		display: flex;
 		justify-content: space-around;
+    position: relative;
 
 		.setAgCountbtna {
 			margin-top: 40rpx;
-			width: 200rpx;
+			// width: 200rpx;
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
@@ -1610,7 +1610,7 @@ import { Toast } from '../../../libs/uniApi';
 
 		.setAgCountbtnc {
 			margin-top: 40rpx;
-			width: 200rpx;
+			// width: 200rpx;
 			height: 74rpx;
 			text-align: center;
 			line-height: 74rpx;
@@ -1623,6 +1623,22 @@ import { Toast } from '../../../libs/uniApi';
 			color: #fff;
 
 		}
+    
+    .border{
+      position: absolute;
+      top: 0;
+      left: -28rpx;
+      width: 100vw;
+      height: 100%;
+      border-radius: 40rpx 40rpx 0 0;
+      box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
+    }
+    
+    .btn{
+      width: 694rpx;
+      font-weight: bold;
+      font-size: 34rpx;
+    }
 	}
 
 	.settledSuccessMain {

uni_modules/guyue-updater/pages/updater.vue

@@ -3,12 +3,17 @@
 
 		<view class="main" @click.stop="">
 			<view class="header">
-				<image src="../assets/bg1.png" class="bg1" />
+        <view class="bg1" style="display: flex;justify-content: center;align-items: center;">
-				<image src="../assets/bg2.png" class="bg2" />
+          <view style="text-align: center; color: #fff;font-size: 34rpx;">发现新版本</view>
-				<view class="version-title">{{ updateParams.title }}</view>
-				<view class="version-name" v-if="updateParams.versionName">V{{ updateParams.versionName }}</view>
         </view>
-			<view class="title">更新内容：</view>
+        <view class="bg2"></view>
+				<!-- <image src="../assets/bg1.png" class="bg1" /> -->
+				<!-- <image src="../assets/bg2.png" class="bg2" /> -->
+				<!-- <view class="version-title">{{ updateParams.title }}</view> -->
+				<!-- <view class="version-name" v-if="updateParams.versionName">V{{ updateParams.versionName }}</view> -->
+			</view>
+        <view style="color: #333;padding-left: 30rpx;">{{ updateParams.title }} </view>
+			<view class="title">V{{ updateParams.versionName }} 更新内容</view>
 			<view class="content">
 				<rich-text :nodes="content" />
 			</view>
@@ -75,7 +80,7 @@
 			const data = {
 				title: '发现新版本',
 				updateBtnText: '立即升级',
-				downMsgTip: '下载中，请稍后',
+				downMsgTip: '正在更新中',
 				downSucTip: '下载完成，安装中',
 				downErrorTip: '下载失败，请重试',
 				quiet: false,
@@ -188,9 +193,12 @@
 
 	.main {
 		width: 75%;
-		background-color: #fff;
+		// background-color: #fff;
 		border-radius: 8rpx;
 		padding-bottom: 10rpx;
+    background-image: url('../assets/bg1.png');
+    background-size: 100% 100%;
+    
 	}
 
 	.header {
@@ -198,7 +206,7 @@
 
 		.bg1 {
 			width: 100%;
-			height: calc(100vw * 0.375);
+			height: calc(100vw * 0.305);
 			border-top-left-radius: 8rpx;
 			border-top-right-radius: 8rpx;
 		}
@@ -233,7 +241,7 @@
 	}
 
 	.title {
-		background-color: #ff6d42;
+		background-color: #ff6d20;
 		color: #fff;
 		display: inline-block;
 		margin-top: 12rpx;
@@ -255,7 +263,7 @@
 
 	.button {
 		margin: 20rpx 30rpx;
-		background-color: #ffaa00;
+		background-color: #ff6d20;
 		color: #fff;
 		font-size: 30rpx;
 		text-align: center;