支付方式显示问题优化、活动页面列表改为活动(周辰军提)

pages/tabBar/activity/details.vue

@@ -34,41 +34,44 @@
 					color="#FFFFFF" background-color="#E75F37" />
 			</view>
 		</view>
-		<scroll-view scroll-y="true" style="max-height: 28vh;">
-			<view class="card" v-for="(item,index) in form.activityItemsList" :key="index">
-				<view style="margin-left: 20rpx;">
-					<u-checkbox-group v-model="item.select" placement="column" @change="rowSelect($event,item)"
-						:size='15'>
-						<u-checkbox activeColor="#E75F37" shape="circle" :customStyle="{marginBottom: '8px'}" label="选择"
-							:name="true" labelSize="28rpx" labelColor='#3B3B3B'></u-checkbox>
-					</u-checkbox-group>
-				</view>
-				<view style="background: #FCF7F5;padding:40rpx 20rpx;border-radius: 10rpx;">
-					<view style="display: flex;align-items: center;">
-						<view style="width: 120rpx;height: 120rpx;">
-							<image :src="item.url"
-								style="width: 120rpx;height: 120rpx;border-radius: 20rpx;border: 2rpx solid #EEEEEE;">
-							</image>
-						</view>
-						<view style="width: 100%;display: flex;margin-left: 8rpx;">
-							<view>
-								<u--text :text="item.cname" size="24rpx" color='#797979' lines="1"></u--text>
-								<view style="color: #E75F37;font-size: 32rpx;">特价:￥{{item.priceOne}}</view>
-								<view style="color: #797979;font-size: 24rpx;">原价:￥{{item.priceOnePrimary}}</view>
-							</view>
-							<view style="display: flex;justify-content: space-between;margin-top: 20rpx;">
+<!--		<scroll-view scroll-y="true" style="max-height: 28vh;">
 
-								<view>
-									<u-number-box v-model="item.purchaseQuantity" :min="item.minQuantity"
-										:max="item.maxQuantity" buttonSize="53rpx" color="#414141" bgColor="#FCF7F5"
-										iconStyle="color:#A4A4A4" @change="rowNumber($event,item)"></u-number-box>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
+		</scroll-view>-->
+    <view style="padding-bottom: 290rpx;">
+      <view class="card" v-for="(item,index) in form.activityItemsList" :key="index">
+        <view style="margin-left: 20rpx;">
+          <u-checkbox-group v-model="item.select" placement="column" @change="rowSelect($event,item)"
+                            :size='15'>
+            <u-checkbox activeColor="#E75F37" shape="circle" :customStyle="{marginBottom: '8px'}" label="选择"
+                        :name="true" labelSize="28rpx" labelColor='#3B3B3B'></u-checkbox>
+          </u-checkbox-group>
+        </view>
+        <view style="background: #FCF7F5;padding:40rpx 20rpx;border-radius: 10rpx;">
+          <view style="display: flex;align-items: center;">
+            <view style="width: 120rpx;height: 120rpx;">
+              <image :src="item.url"
+                     style="width: 120rpx;height: 120rpx;border-radius: 20rpx;border: 2rpx solid #EEEEEE;">
+              </image>
+            </view>
+            <view style="width: 100%;display: flex;margin-left: 8rpx;">
+              <view>
+                <u--text :text="item.cname" size="24rpx" color='#797979' lines="1"></u--text>
+                <view style="color: #E75F37;font-size: 32rpx;">特价:￥{{item.priceOne}}</view>
+                <view style="color: #797979;font-size: 24rpx;">原价:￥{{item.priceOnePrimary}}</view>
+              </view>
+              <view style="display: flex;justify-content: space-between;margin-top: 20rpx;">
+
+                <view>
+                  <u-number-box v-model="item.purchaseQuantity" :min="item.minQuantity"
+                                :max="item.maxQuantity" buttonSize="53rpx" color="#414141" bgColor="#FCF7F5"
+                                iconStyle="color:#A4A4A4" @change="rowNumber($event,item)"></u-number-box>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
 		<view class="submitBar">
 			<view style="margin:20rpx 47rpx;">
 				<view
@@ -468,6 +471,7 @@
 		bottom: 0;
 		background-color: #fff;
 		width: 100%;
+    height: 290rpx;
 		z-index: 10;
 
 		::v-deep .u-checkbox__icon-wrap {
@@ -498,4 +502,4 @@
 			border-radius: 33rpx;
 		}
 	}
-</style>
+</style>

pages/views/salesSlip/index.vue

@@ -64,8 +64,10 @@
 							订单编号：<text style="color: #C4C4C4;">{{item.ordNo}}</text>
 						</view>
 						<view style="margin-bottom: 20rx;">
-							支付方式：<text
-								style="color: #C4C4C4;">{{item.payType && item.payType.indexOf('01') != -1?'扫码支付':'微信支付'}}</text>
+							支付方式：<text style="color: #C4C4C4;">
+<!--              {{item.payType && item.payType.indexOf('01') != -1?'扫码支付':'微信支付'}}-->
+              {{ item.receivableType ? item.receivableType : '' }}
+            </text>
 						</view>
 						<view>
 							下单时间：<text style="color: #C4C4C4;">{{item.createTime}}</text>
@@ -273,4 +275,4 @@
 			height: 60rpx;
 		}
 	}
-</style>
+</style>