Merge branch 'master' of https://git.bjtdba.com/shop/H5-Merchant

shop/perating/activitecode.vue

@@ -1,18 +1,19 @@
 <template>
   <view class="process" v-if="status == 1">
-    <!-- <view class="process-header"> -->
-    <!-- 			<view class="process-header-text">
-				<view class="process-header-text-neishi" @click="topgi">
-					<view class="process-header-text-icon">
-						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
-						</image>
-					</view>
-				</view>
-				<view class="process-header-text-title">
-					聚合码
-				</view>
-			</view> -->
-    <!-- </view> -->
+    <view class="statement-header">
+      <view class="statement-header-text">
+        <view class="statement-header-text-neishi" @click="topgi">
+          <view class="statement-header-text-icon">
+            <image
+              src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png"
+              mode="widthFix"
+            >
+            </image>
+          </view>
+        </view>
+        <view class="statement-header-text-title" @click="topgi"> 返回</view>
+      </view>
+    </view>
     <view class="activite-nav">
       <view class="activite-card">
         <image
@@ -574,6 +575,46 @@ page {
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  
+  .statement-header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 111;
+    width: 100%;
+    height: 100rpx;
+    background: url("https://cdn.bjtdba.com/vod/image/2022-08-23/20220823132549341.png");
+    display: flex;
+    justify-content: center;
+  
+    .statement-header-text {
+      width: 686rpx;
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #333333;
+      display: flex;
+      // margin-top: 107rpx;
+      align-items: center;
+  
+      .statement-header-text-neishi {
+        width: 45rpx;
+        height: 45rpx;
+        margin-right: 17rpx;
+  
+        .statement-header-text-icon {
+          width: 36rpx;
+          height: 36rpx;
+          margin-top: 2rpx;
+  
+          image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+    }
+  }
+  
 
   .activite-nav {
     width: 100%;

shop/services/setting.vue

@@ -1,18 +1,18 @@
 <template>
 	<view class="setting">
-		<view class="setting-header">
-			<view class="setting-header-text">
-				<view class="setting-header-text-neishi" @click="topgi">
-					<view class="setting-header-text-icon">
-						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
-						</image>
-					</view>
-				</view>
-
-				<view class="setting-header-text-title">
-					分润设置
-				</view>
+		<view class="statement-header">
+		  <view class="statement-header-text">
+			<view class="statement-header-text-neishi" @click="topgi">
+			  <view class="statement-header-text-icon">
+				<image
+				  src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png"
+				  mode="widthFix"
+				>
+				</image>
+			  </view>
 			</view>
+			<view class="statement-header-text-title" @click="topgi"> 分润设置 </view>
+		  </view>
 		</view>
 		<view class="setting-shehi">
 			<view class="">
@@ -184,45 +184,45 @@
 		flex-direction: column;
 		align-items: center;
 
-		.setting-header {
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 111;
-			width: 100%;
-			height: 176rpx;
-			background: #FFFFFF;
-			display: flex;
-			justify-content: center;
-
-			.setting-header-text {
-				width: 686rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				display: flex;
-				margin-top: 107rpx;
-				align-items: center;
-
-				.setting-header-text-neishi {
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: 17rpx;
-
-					.setting-header-text-icon {
-						width: 36rpx;
-						height: 36rpx;
-						margin-top: 2rpx;
-
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-				}
-
-			}
-		}
+  .statement-header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 111;
+    width: 100%;
+    height: 100rpx;
+    background: #ffffff;
+    display: flex;
+    justify-content: center;
+  
+    .statement-header-text {
+      width: 686rpx;
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #333333;
+      display: flex;
+      // margin-top: 107rpx;
+      align-items: center;
+  
+      .statement-header-text-neishi {
+        width: 45rpx;
+        height: 45rpx;
+        margin-right: 17rpx;
+  
+        .statement-header-text-icon {
+          width: 36rpx;
+          height: 36rpx;
+          margin-top: 2rpx;
+  
+          image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+    }
+  }
+  
 
 		.setting-shehi {
 			width: 686rpx;