代码变动

pages/cashier/index.vue

@@ -410,6 +410,7 @@ export default {
           console.log(res);
           if (res.data.status == 200) {
             this.merchantCashierShow = res.data.data.merchantCashierShow;
+			this.merchantCashierShow.create_time = this.merchantCashierShow.create_time.split(' ')[0]
           }
         },
         (fail) => {
@@ -669,7 +670,7 @@ page {
           }
 
           .cashier-tablin-nie-left-text {
-            width: 247rpx;
+            width: 280rpx;
             height: 100%;
             display: flex;
             flex-direction: column;

pages/cashier/latestRecords.vue

@@ -6,8 +6,8 @@
         <image class="user-avatar" :src="item.avatar" @error="handleError" v-if="item.avatar&&!isError"></image>
         <image class="user-avatar" src="/static/images/new_ui/wutu.png" v-else></image>
         <view class="user-details">
-          <view class="user-name">用户 {{ item.nickname }}</view>
-          <view class="user-id">ID:{{ item.out_trade_no }}</view>
+          <view class="user-name">{{ item.nickname }}</view>
+          <!-- <view class="user-id">ID:{{ item.out_trade_no }}</view> -->
           <view class="consume-amount">消费金额 {{ item.money || "0.00" }}</view>
         </view>
       </view>
@@ -15,7 +15,7 @@
         <view class="record-time">{{ item.pay_time }}</view>
         <view class="pv-info">pv: {{ item.pv }}</view>
         <view v-for="(reward, rewardIndex) in rewards" :key="rewardIndex" class="reward-info">
-          获取 {{ reward.type=="jingdou"?item.jingdou||0 :item.gongxian ||0}} {{ reward.name }}
+         {{ reward.name }} : {{ reward.type=="jingdou"?item.jingdou||0 :item.gongxian ||0}} 
         </view>
       </view>
     </view>

shop/perating/activitecode.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="process" v-if="status==1">
-		<view class="process-header">
-			<view class="process-header-text">
+		<!-- <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">
@@ -11,8 +11,8 @@
 				<view class="process-header-text-title">
 					聚合码
 				</view>
-			</view>
-		</view>
+			</view> -->
+		<!-- </view> -->
 		<view class="activite-nav">
 			<view class="activite-card">
 				<image class="activite-card-logo"
@@ -37,13 +37,13 @@
 				</view>
 
 			</view>
-
+<!-- 
 			<view class="downLoadButton" @click="clickGeneratePicture">
 				<image class="downLoad-image" src="../../static/saveImage.png" mode=""></image>
 				<view class="downLoad-text">
 					保存图片
 				</view>
-			</view>
+			</view> -->
 
 		</view>
 
@@ -263,6 +263,8 @@
 			// 保存图片
 			saveImage() {
 				let that = this
+				console.log('xxxxxxxxxxxx')
+				console.log(that.picture)
 				if (that.picture !== "") {
 					uni.hideLoading();
 
@@ -363,49 +365,10 @@
 		align-items: center;
 		justify-content: center;
 
-		.process-header {
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 111;
-			width: 100%;
-			height: 176rpx;
-			background: #FFFFFF;
-			display: flex;
-			justify-content: center;
-
-			.process-header-text {
-				width: 686rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #333333;
-				display: flex;
-				margin-top: 107rpx;
-				align-items: center;
-
-				.process-header-text-neishi {
-					width: 45rpx;
-					height: 45rpx;
-					margin-right: 17rpx;
-
-					.process-header-text-icon {
-						width: 36rpx;
-						height: 36rpx;
-						margin-top: 2rpx;
-
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-				}
-			}
-		}
-
 		.activite-nav {
 			width: 100%;
 			height: 100%;
-			margin-top: 176rpx;
+			// margin-top: 176rpx;
 			background-color: red;
 			display: flex;
 			flex-direction: column;

shop/services/setting.vue

@@ -26,8 +26,8 @@
 			<!-- 			<view class="uni-input">{{fenRunList[FenRunBiLiListindex].num}}</view>
 					</picker> -->
 				<!-- </view> -->
-				<input style=" text-align: center;" maxlength="3" v-model="systemConfig.value" value=""
-					@input="inputphone" />
+				<input style="width: 30px;" maxlength="3" v-model="systemConfig.value" value=""
+					@input="inputphone" />%
 				<!-- <view class="" style="margin-right: 150rpx;">
 					30%
 				</view> -->