feat: 新增积分商城模块（11个页面）

api/common.js

@@ -13,6 +13,9 @@ export function uploadOSS(data) {
 export function getDictByKey(data) {
 	return request('/app/common/getDictByKey', data, 'GET');
 }
+export function getStoreDictByKey(data) {
+	return request('/store/app/common/getDictByKey', data, 'GET');
+}
 
 
 export function getSelectUserList(nickName) {

api/integral.js

@@ -66,8 +66,32 @@ let request = new Request().http
   export function addDownIntegral(data) {
    	return request('/app/api/addIntegral',data,'POST','application/json;charset=UTF-8');
   }
+
+export function payment(data) {
+  	return request('/app/integral/payment',data,'POST','application/json;charset=UTF-8');
+ }
+ export function cannelOrder(data) {
+  	return request('/app/integral/cannelOrder',data,'POST','application/json;charset=UTF-8');
+ }
  
- 
+ export function getCartCount() {
+  	return request('/app/integral/getCartCount',null,'GET');
+ }
+ export function addOrUpdateCart(data) {
+  	return request('/app/integral/addOrUpdateCart',data,'POST','application/json;charset=UTF-8');
+ }
+ export function getCarts() {
+  	return request('/app/integral/getCarts',null,'GET');
+ }
+ export function delCart(data) {
+  	return request('/app/integral/delCart',data,'POST','application/json;charset=UTF-8');
+ }
+ export function createCartOrder(data) {
+  	return request('/app/integral/createCartOrder',data,'POST','application/json;charset=UTF-8');
+ }
+ export function getCartByIds(data) {
+  	return request('/app/integral/getCartByIds',data,'POST','application/json;charset=UTF-8');
+ }
  
  
  

main.js

@@ -8,7 +8,7 @@ import uView from "@/node_modules/uview-ui";
 
 import {parseIDCardInfo,logout,checkCompanyUserLoginState,parseText,getDictLabelName,parseIdCard,getAge,parsePhone,isEmpty,getDict,
 isLogin,navBack,navTo,getUserInfo,formatHour,dateFormatStr,registerIdCode,updateMsgDot,handleBindCompanyFsUser,
-setSource,companyUserIsLogin,checkWechatInstalled,isIos,isAndroid,isAgreePrivacy} from './utils/common.js'
+setSource,companyUserIsLogin,checkWechatInstalled,isIos,isAndroid,isAgreePrivacy,getDictLabel2Name} from './utils/common.js'
 
 import { showLoginPage,getRegistrationID } from './utils/login.js'
 import { formatSeconds,formatDate } from './utils/tools.js'
@@ -26,6 +26,7 @@ App.mpType = 'app'
 Vue.use(Vuex)
 Vue.use(uView);
 Vue.prototype.$getDict = getDict;
+Vue.prototype.$getDictLabel2Name = getDictLabel2Name;
 Vue.prototype.$checkCompanyUserLoginState = checkCompanyUserLoginState;
 Vue.prototype.$isLogin = isLogin;
 Vue.prototype.$isAgreePrivacy = isAgreePrivacy;

pages/course/components/answerPromptPopup.vue

@@ -16,7 +16,7 @@
 				<view class="points-text">明天再来哦</view>
 			</template>
 			<view class="tips-text">每节课拥有3次答题机会</view>
-			<view v-if="~~typeStatus === 1" class="btn primary-btn">前往积分商城兑换</view>
+			<view v-if="~~typeStatus === 1" class="btn primary-btn" @tap="goIntegralGoodsList">前往积分商城兑换</view>
 			<view class="btn outline-btn" @tap="close">继续观看</view>
 		</view>
 	</u-popup>
@@ -54,6 +54,12 @@ export default {
 		close() {
 			this.$emit('closeMethod')
 		},
+		// 前往积分商城兑换
+		goIntegralGoodsList() {
+			uni.navigateTo({
+				url: '/pages_points/integralGoodsList'
+			})
+		}
 	}
 }
 </script>

pages_mall/index.vue

@@ -51,16 +51,25 @@
 		},
 		data() {
 			return {
-				currentTab: 0
+				currentTab: 0,
+				isFirstLoad: true // 标记是否第一次进入页面
 			}
 		},
-		onShow() {
-			// const tabCart = uni.getStorageSync('tabCart')
-			// if (tabCart) {
-			// 	this.currentTab = 2
-			// 	uni.removeStorageSync('tabCart')
-			// }
+		onLoad() {
+			this.isFirstLoad = true
 			this.currentTab = 0
+		},
+		onShow() {
+			// 关键判断：不是第一次加载 = 从返回进入
+			if (!this.isFirstLoad) {
+				const tabCart = uni.getStorageSync('tabCart')
+				if (tabCart) {
+					this.currentTab = 2
+					uni.removeStorageSync('tabCart')
+				}
+			}
+			// 第一次显示后，标记为非首次
+			this.isFirstLoad = false
 			uni.hideTabBar();
 		},
 		onUnload() {

pages_mall/my.vue

@@ -158,7 +158,7 @@
 					{
 						name: '积分商城',
 						icon: '/static/image/my/points_mall.png',
-						url: ''
+						url: '/pages_points/integralGoodsList'
 					},
 					{
 						name: '优惠券',

pages_points/cart.vue

@@ -0,0 +1,471 @@
+<template>
+	<view class="content">
+		<!-- 商品列表 -->
+		<view class="goods-list">
+			<view class="item" v-for="(item,index) in carts" :key="index">
+				<view class="choose" @click.stop="checkChange(item,index)">
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/fs/20250729/1753758788583.png" v-show="item.checked"></image>
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/fs/20250729/1753758821601.png" v-show="!item.checked"></image>
+				</view>
+				<image class="goods-img" :src="item.imgUrl" mode="aspectFit" @click="showProduct(item)"></image>
+				<view class="info-box" @click="showProduct(item)">
+					<view>
+						<view class="title-box">
+							<view class="title ellipsis">{{ item.goodsName }}</view>
+						</view>
+					</view>
+					<view class="price-num">
+						<view class="price">
+							<text class="text" >{{item.newIntegral}}</text>
+							<text class="unit">积分</text>
+							<text class="unit">+</text>
+							<text class="text" >{{item.newCash.toFixed(2)}}</text>
+							<text class="unit">元</text>
+						</view>
+						<view class="num-box" @click.stop>
+							<u-number-box v-model="item.cartNum" buttonSize="48rpx" integer :step="1" :min="1" :max="100000" @change="changeCartNum($event,item)"></u-number-box>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	 
+		<view v-if="carts.length == 0" class="no-data-box">
+			<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdtappimgs/cf4a86b913a04341bb44e34bb4d37aa2.png" mode="aspectFit"></image>
+			<view class="empty-title">购物车为空</view>
+			<view class="empty-cart-btn x-f" @click="goPage">去逛逛</view>
+		</view>
+		<!-- 猜你喜欢 -->
+		 
+		<!-- <view class="like-product">
+			<likeProduct  ref="product" />
+		</view> -->
+		<!-- 底部按钮 -->
+		<view class="btn-foot">
+			<view class="left">
+				<view class="choose" @click="handleCheckAll()">
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/fs/20250729/1753758788583.png" v-show="checkAll"></image>
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/fs/20250729/1753758821601.png" v-show="!checkAll"></image>
+				</view>
+				<text class="text">全选</text>
+				<text class="text" @click="delCart()">删除</text>
+			</view>
+			<view class="right">
+				<view>
+					<view class="total">
+						<text class="label">合计：</text>
+						<view class="price">
+							<text class="unit">¥</text>
+							<text class="num">{{totalMoney.toFixed(2)}}</text>
+						</view>
+					</view>
+					<view class="total">
+						<text class="label">所需积分：</text>
+						<view class="price">
+							<text class="num">{{totalIntegral}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="btn" @click="submit">结算</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import { getCarts,addOrUpdateCart,delCart } from '@/api/integral.js'
+	// import likeProduct from '@/components/likeProduct.vue'
+	export default {
+		// components: {
+		// 	likeProduct
+		// },	
+		data() {
+			return {
+				totalMoney:0.00,
+				totalIntegral: 0,
+				carts:[],
+				checkAll:false,
+			}	
+		},
+		onLoad() {
+ // this.getCarts();
+		},
+		onShow() {
+		this.getCarts();	
+		},
+		onReachBottom() {
+			// this.$refs.product.getGoodsProducts();
+		},
+		methods: {
+			delCart(){
+				var selectCarts=this.carts.filter(ele => ele.checked==true).map(ele => {
+				  return ele.id
+				});
+				if(selectCarts.length==0){
+					uni.showToast({
+						icon:'none',
+						title: "请选择商品删除",
+					});
+					return;
+				}
+				let data = {ids:selectCarts};
+				delCart(selectCarts).then(
+					res => {
+						if(res.code==200){
+							uni.showToast({
+								icon:'success',
+								title: "操作成功",
+							});
+							this.getCarts()
+						}else{
+							
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			computedMoney(){
+				let totalIntegral = 0;
+				let totalMoney = 0;	
+				let arry = this.carts.filter(item=>item.checked)
+				arry.forEach(item => {
+				  totalIntegral += item.newIntegral * item.cartNum;
+				  totalMoney += item.newCash * item.cartNum;
+				});
+				this.totalIntegral = totalIntegral;
+				this.totalMoney = totalMoney;
+			},
+			handleCheckAll(){
+				this.checkAll=!this.checkAll;
+				var that=this;
+				this.carts.forEach((item,index,arr)=>{
+				     item.checked=that.checkAll;
+				})
+				this.computedMoney();
+			},
+			checkChange(item,index){
+				item.checked=!item.checked;
+				this.checkAll =  this.carts.length > 0 &&this.carts.every(item=>item.checked)
+				this.computedMoney();
+			},
+			changeNum(e,item) {
+				item.cartNum = e.detail.value.replace(/\D/g, '')
+				if (item.cartNum <= 1) {
+				  uni.showToast({
+				    title: "已经是底线啦!",
+				    icon: "none",
+				    duration: 2000
+				  });
+				  return;
+				}
+				if(item.cartNum < 1) {
+					item.cartNum = 1
+				}
+				if(item.cartNum>=item.stock){
+					item.cartNum=item.stock;
+				}
+				this.changeCartNum(item)
+			},
+			getCarts(){
+				getCarts().then(
+					res => {
+						if(res.code==200){
+							 this.carts=res.carts;
+							 this.carts.forEach((item,index,arr)=>{
+							      item.checked=false;
+							 })
+							 this.checkAll =  this.carts.length > 0 &&this.carts.every(item=>item.checked)
+							 this.computedMoney();
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			changeCartNum(e, item) {
+			  // 保存原始数量和索引
+			  const originalNum = item.cartNum;
+			  const itemIndex = this.carts.findIndex(cart => cart.id === item.id);
+			  
+			  // 先更新本地UI（立即响应）
+			  item.cartNum = e.value;
+			  
+			  let data = { cartNum: e.value, goodsId: item.goodsId, isCart: 1 };
+			  addOrUpdateCart(data).then(
+			    res => {
+			      if (res.code == 200) {
+			        this.computedMoney();
+			      } else {
+			        // 库存不足等错误情况
+			        // 恢复原始数量
+			        this.carts[itemIndex].cartNum = originalNum;
+			        
+			        // 如果需要，可以更新库存信息
+			        if (res.data && res.data.stock) {
+			          this.carts[itemIndex].stock = res.data.stock;
+			        }
+			        
+			        // 强制刷新
+			        this.$forceUpdate();
+			        
+			        // 计算总额
+			        this.computedMoney();
+			        
+			        uni.showToast({
+			          icon: 'none',
+			          title: res.msg,
+			          duration: 2000
+			        });
+			      }
+			    },
+			    rej => {
+			      // 网络错误
+			      this.carts[itemIndex].cartNum = originalNum;
+			      this.$forceUpdate();
+			      this.computedMoney();
+			      
+			      uni.showToast({
+			        icon: 'none',
+			        title: '网络错误，请重试',
+			        duration: 2000
+			      });
+			    }
+			  );
+			},
+			// 结算
+			submit() {
+				var selectCarts=this.carts.filter(ele => ele.checked==true).map(ele => {
+				  return ele.id
+				});
+				if(selectCarts.length==0){
+					uni.showToast({
+						icon:'none',
+						title: "请选择商品",
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: '/pages_points/confirmIntegralOrder?type=cart&cartIds='+selectCarts.toString()
+				})
+			},
+			showProduct(item){
+				console.log("这个item")
+				uni.navigateTo({
+					url: '/pages_points/integralGoodsDetails?goodsId='+item.goodsId
+				})
+			},
+			goPage() {
+				uni.navigateTo({
+					url: '/pages_points/integralGoodsList'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+	.content{
+		height: 100%;
+		padding: 20upx;
+		.goods-list{
+			.item{
+				box-sizing: border-box;
+				background: #FFFFFF;
+				border-radius: 16upx;
+				margin-bottom: 20upx;
+				padding: 30upx;
+				display: flex;
+				align-items: center;
+				&:last-child{
+					margin-bottom: 0;
+				}
+				.goods-img{
+					width: 160upx;
+					height: 160upx;
+					background: #FFFFFF;
+					margin-right: 30upx;
+					flex-shrink: 0;
+				}
+				.info-box{
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					width: calc(100% - 255upx);
+					.title-box{
+						width: 100%;
+						display: flex;
+						align-items: center;
+						.title{
+							flex: 1;
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #111111;
+							line-height: 1;
+						}
+					}
+					.price-num{
+						margin-top: 24rpx;
+						.price{
+							margin-bottom: 24rpx;
+							display: flex;
+							align-items: flex-end;
+							.unit{
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #FF233C;
+								line-height: 1.2;
+								margin-right: 4upx;
+							}
+							.text{
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #FF233C;
+								line-height: 1;
+							}
+						}
+						.num-box{
+							display: flex;
+							align-items: center;
+							justify-content: flex-end;
+							.img-box{
+								width: 60upx;
+								height: 60upx;
+								// border-radius: 4upx;
+								border: 1px solid #dddddd;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								image{
+									width: 25rpx;
+									height: 25rpx;
+								}
+							}
+							input{
+								width: 60upx;
+								height: 60upx;
+								line-height: 60upx;
+								font-size: 28upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								// border-radius: 4upx;
+								border-top: 1px solid #dddddd;
+								border-bottom: 1px solid #dddddd;
+								text-align: center;
+								// margin: 0 16upx;
+							}
+						}
+					}
+				}
+			}
+		}
+		.like-product{
+			padding-bottom: 120upx;
+		}
+		.btn-foot{
+			box-sizing: border-box;
+			width: 100%;
+			height: 121upx;
+			background: #FFFFFF;
+			padding: 16upx 30upx 16upx 30upx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			z-index: 99;
+			.left{
+				display: flex;
+				align-items: center;
+				.text{
+					margin-left: 14upx;
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 1;
+				}
+			}
+			.right{
+				display: flex;
+				align-items: center;
+				.total{
+					display: flex;
+					align-items: flex-end;
+					margin-right: 36upx;
+					.label{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						line-height: 1.5;
+					}
+					.price{
+						display: flex;
+						align-items: flex-end;
+						.unit{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FF233C;
+							line-height: 1.2;
+							margin-right: 10upx;
+						}
+						.num{
+							font-size: 32rpx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FF233C;
+							line-height: 1;
+						}
+					}
+				}
+				.btn{
+					width: 200upx;
+					height: 88upx;
+					line-height: 88upx;
+					text-align: center;
+					font-size: 30upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FFFFFF;
+					background: #FF233C;
+					border-radius: 44upx;
+				}
+			}
+		}
+	}
+	.choose {
+		margin-right: 20rpx;
+		image{
+			width: 36rpx;
+			height: 36rpx;
+			flex-shrink: 0;
+		}
+	}
+	.empty-cart-btn {
+		border: 1rpx solid #FF233C;
+		color: #FF233C;
+		padding: 10rpx 30rpx;
+		border-radius: 40rpx;
+		margin-bottom: 20vh;
+		margin-top: 50rpx;
+		display: inline-block;
+	}
+</style>

pages_points/confirmIntegralOrder.vue

@@ -0,0 +1,695 @@
+<template>
+	<view>
+		<view class="inner-box">
+			<!-- 收货人 -->
+			<view class="address-box" v-if="address==null" @click="openAddress()">
+				<view class="left">
+					<view class="name-box">
+						<text class="text name">添加收货地址</text>
+					</view>
+				</view>
+				<view class="arrow-box">
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+			<view class="address-box" v-if="address!=null" @click="openAddress()">
+				<view class="left">
+					<view class="name-box">
+						<text class="text name">{{address.realName}}</text>
+						<text class="text" v-if="address.phone!=null">{{address.phone}}</text>
+					</view>
+					<view class="address">
+						{{address.province}}{{address.city}}{{address.district}}{{address.detail}}
+					</view>
+				</view>
+				<view class="arrow-box">
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+			<!-- 药品列表 -->
+			<view class="goods-list">
+				<view class="item" v-for="(item,index) in goodsList" :key="index">
+					<view class="img-box">
+						<image :src="item.imgUrl==''?'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/drug.svg':item.imgUrl" mode="aspectFill"></image>
+					</view>
+					<view class="info-box">
+						<view>
+							<view class="name-box ellipsis2">
+								{{item.goodsName}}
+							</view>
+							 
+						</view>
+						<view class="price-num">
+							<view class="price">
+								<text class="num">{{item.newIntegral}}</text>
+								<text class="unit">积分</text>
+								<text class="num" v-show="item.newCash>0">+{{item.newCash.toFixed(2)}}</text>
+								<text class="unit" v-show="item.newCash>0">元</text>
+							</view>
+							<view class="num"  >x{{item.cartNum}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="other-info">
+				<view class="item">
+					<view class="left">
+						<text class="label">所需积分：</text>
+					</view>
+					<view class="right">
+						<text class="text">{{totalIntegral}}</text>
+					</view>
+				</view>
+				<view class="item">
+					<view class="left">
+						<text class="label">我的积分：</text>
+					</view>
+					<view class="right">
+						<text class="text">{{integral}}</text>
+					</view>
+				</view>
+				<view class="item" v-if='totalMoney>0'>
+					<view class="left">
+						<text class="label">支付金额：</text>
+					</view>
+					<view class="right">
+						<text class="text">{{totalMoney.toFixed(2)}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="pay-type" v-if='totalMoney>0'>
+				<view class="title">支付方式</view>
+				<radio-group>
+					<view class="item">
+						<view class="left" >
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/wecha_pay.png" mode=""></image>
+							<text class="text">全款支付</text>
+						</view>
+						<label>
+							<radio :value="1" :checked="payType=='1'" color="#FF233C" />
+						</label>
+					</view>
+				</radio-group>
+			</view>
+			<!-- 备注 -->
+			<!-- <view class="remarks" v-if='totalMoney>0&&order!=null'>
+				<input type="text" v-model="order.remark" placeholder="备注留言（选填）" placeholder-class="input" />
+			</view> -->
+		</view>
+		
+		<!-- 底部按钮 -->
+		<view class="btn-box" v-if="goodsList&&goodsList.length > 0">
+			<view class="btn" @click="payOrder()">{{totalMoney>0?'立即支付':'立即兑换'}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getAddressList} from '@/api/address'
+	import {getCartByIds,createCartOrder} from '@/api/integral.js'
+	import {getUserInfo} from '@/api/user'
+	export default {
+		data() {
+			return {
+				addressId:null,
+				address:null,
+				orderId:null,
+				order:null,
+				goodsList:[],
+				integral: 0,
+				totalIntegral: 0,
+				payTypes: [],
+				payType: '1',
+				alipayQrCode:null,
+				showPayTips:false,
+				cartIds: '',
+				totalMoney: 0
+			}
+		},
+		onLoad(option) {
+			this.getAddressList()
+			this.cartIds=option.cartIds || '';
+			var that=this;
+			uni.$on('updateAddress', (e) => {
+				that.addressId=e.addressId;
+			 	that.address=e;
+				that.address.address=e.province+e.city+e.district+e.detail
+			})
+			this.getCartByIds();
+			this.getUserInfo();
+		},
+		methods: {
+			getAddressList(){
+				uni.showLoading({
+					title:"正在加载中"
+				})
+				getAddressList().then(
+					res => {
+						uni.hideLoading()
+						if(res.code==200){
+							const defaultAddress = res.data.find(item => item.isDefault == 1);
+							        
+							        if(defaultAddress){
+							          this.address = defaultAddress;
+									  this.addressId=defaultAddress.addressId
+							          console.log('找到默认地址:', defaultAddress);
+							        } else {
+							        
+							        }
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			getUserInfo(){
+				getUserInfo().then(
+					res => {
+						if(res.code==200){
+							if(res.user!=null){
+								this.integral=res.user.integral;
+							}
+						}
+					},
+					rej => {}
+				);
+			},
+			getCartByIds(){
+				const ids = this.cartIds.split(',')
+				getCartByIds(ids).then(
+					res => {
+						if(res.code==200){
+							this.goodsList=res.data;
+							this.totalIntegral = this.calcTotal(this.goodsList,'integral')
+							this.totalMoney = this.calcTotal(this.goodsList,'newCash')
+						}else{
+							 
+						}
+					},
+					rej => {}
+				);
+			},
+			calcTotal(cartData,type) {
+			  let total = 0;
+			
+			  cartData.forEach(item => {
+			    total += item[type] * item.cartNum;
+			  });
+			
+			  return total;
+			},
+			openAddress(){
+				uni.navigateTo({
+					url: '/pages_user/user/address'
+				})
+			},
+			payOrder(){
+				if(this.addressId==null){
+					uni.showToast({
+						icon:'none',
+						title: "请选择收货地址",
+					});
+					return;
+					
+				}
+				var data = {
+					ids:this.cartIds.split(','),
+					addressId:this.addressId,
+				};
+				var that=this;
+				uni.showLoading();
+				createCartOrder(data).then(
+					res => {
+						if(res.code==200){
+							this.orderId = res.order.orderId
+							if(this.totalMoney > 0) {
+								uni.redirectTo({
+									url:"./integralPayment?orderId="+res.order.orderId
+								}) 
+							} else {
+								uni.redirectTo({
+									url:"./integralOrderPaySuccess?orderId="+res.order.orderId
+								}) 
+							} 
+							
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.inner-box{
+		padding: 20upx 20upx 160upx;
+		.address-box{
+			box-sizing: border-box;
+			min-height: 171upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			background-image: url(https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/address_bg.png);
+			background-repeat: no-repeat;
+			background-size: 100% 30upx;
+			background-position: left bottom;
+			padding: 38upx 30upx 36upx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left{
+				width: 92%;
+				.name-box{
+					display: flex;
+					align-items: center;
+					.text{
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #111111;
+						line-height: 1;
+						&.name{
+							margin-right: 30upx;
+						}
+					}
+				}
+				.address{
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 42upx;
+					text-align:left;
+					margin-top: 23upx;
+				}
+			}
+			.arrow-box{
+				width: 12upx;
+				height: 23upx;
+				display: flex;
+				align-items: cenetr;
+				justify-content: cenetr;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+		.goods-list{
+			margin-top: 20upx;
+			padding: 0 30upx;
+			background-color: #FFFFFF;
+			border-radius: 16upx;
+			.item{
+				padding: 30upx 0;
+				border-bottom: 1px solid #EDEEEF;
+				display: flex;
+				align-items: center;
+				.img-box{
+					width: 160upx;
+					height: 160upx;
+					margin-right: 30upx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.info-box{
+					width: calc(100% - 190upx);
+					height: 160upx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					.name-box{
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #111111;
+						line-height: 40upx;
+						.tag{
+							display: inline-block;
+							padding: 0 6upx;
+							height: 30upx;
+							background: linear-gradient(90deg, #C39A58 0%, #E2C99E 100%);
+							border-radius: 4upx;
+							margin-right: 10upx;
+							font-size: 22upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FFFFFF;
+							line-height: 30upx;
+							float: left;
+							margin-top: 7upx;
+						}
+					}
+					.spec{
+						margin-top: 10upx;
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						line-height: 1;
+					}
+					.price-num{
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						.price{
+							display: flex;
+							align-items: flex-end;
+							.unit{
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								line-height: 1.2;
+								margin-right: 4upx;
+							}
+							.num{
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								line-height: 1;
+							}
+						}
+						.num{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+						}
+					}
+				}
+			}
+			.sub-total{
+				height: 88upx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				.label{
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+				.price{
+					display: flex;
+					align-items: flex-end;
+					.unit{
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FF6633;
+						line-height: 1.2;
+						margin-right: 4upx;
+					}
+					.num{
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #FF6633;
+						line-height: 1;
+					}
+				}
+			}
+		}
+		.other-info{
+			margin-top: 20upx;
+			background-color: #fff;
+			border-radius: 20upx;
+			overflow: hidden;
+			padding: 0 30upx;
+			.title{
+				height: 80upx;
+				line-height: 80upx;
+				font-size: 30upx;
+				color: #000;
+				font-weight: bold;
+				border-bottom: 2upx solid #eeeeee;
+			}
+			.item{
+				height: 80upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				&:last-child{
+					border-bottom: none;
+				}
+				.left{
+					flex: 1;
+					display: flex;
+					align-items: center;
+					.label{
+						min-width: 140rpx;
+						font-size: 28upx;
+						color: #000;
+					}
+					.text{
+						font-size: 28upx;
+						color: #1b1b1b;
+					}
+				}
+				.right{
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					.text{
+						font-size: 28upx;
+						color: #1b1b1b;
+					}
+					.ic-close{
+						margin-left: 10rpx;
+						width: 30rpx;
+						height:30rpx;
+					}
+					.ic-back{
+						margin-left: 10rpx;
+						width: 15rpx;
+						height:30rpx;
+					}
+				}
+				.item-btn{
+					max-width: 200rpx;
+					padding: 0rpx 15rpx;
+					height: 48upx;
+					border-radius: 24upx;
+					line-height: 48upx;
+					font-size: 24upx;
+					color: #000;
+					border: 1upx solid #d8d8d8;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+			}
+		}
+		.remarks{
+			height: 88upx;
+			padding: 0 30upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			margin-top: 20upx;
+			display: flex;
+			align-items: center;
+			input{
+				width: 100%;
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+			.input{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+	}
+	
+	
+	.btn-box{
+	 	height: 140upx;
+	 	z-index: 99;
+	 	width: 100%;
+	 	padding: 0rpx 30upx;
+	 	position: fixed;
+	 	bottom: 0;
+	 	left: 0;
+	 	box-sizing: border-box;
+	 	background-color: #ffffff;
+	 	display: flex;
+	 	align-items: center;
+	 	justify-content: center;
+	 	.btn{
+	 		width: 100%;
+	 		height: 88upx;
+	 		line-height: 88upx;
+	 		text-align: center;
+	 		font-size: 34upx;
+	 		font-family: PingFang SC;
+	 		font-weight: 400;
+	 		color: #FFFFFF;
+	 		background: #FF233C;
+	 		border-radius: 10upx;
+	 	}
+	}
+	.pay-type{
+	 	box-sizing: border-box;
+	 	height: 192upx;
+	 	background: #FFFFFF;
+	 	border-radius: 16upx;
+	 	margin-top: 20upx;
+	 	padding: 40upx 30upx;
+	 	display: flex;
+	 	flex-direction: column;
+	 	justify-content: space-between;
+	 	.title{
+	 		font-size: 28upx;
+	 		font-family: PingFang SC;
+	 		font-weight: 500;
+	 		color: #999999;
+	 		line-height: 1;
+	 	}
+	 	.item{
+	 		display: flex;
+	 		align-items: center;
+	 		justify-content: space-between;
+	 		.left{
+	 			display: flex;
+	 			align-items: center;
+	 			image{
+	 				width: 44upx;
+	 				height: 44upx;
+	 				margin-right: 20upx;
+	 			}
+	 			.text{
+	 				font-size: 30upx;
+	 				font-family: PingFang SC;
+	 				font-weight: bold;
+	 				color: #222222;
+	 				line-height: 1;
+	 			}
+	 		}
+	 	}
+	}
+	.coupon{
+		height: 100%;
+		.empty{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 650rpx;
+			width: 100%;
+			image{
+				width: 280rpx;
+				height: 200rpx;
+			}
+		}
+	}
+	.coupon-box{
+		overflow-y: auto;
+		padding: 80rpx 20rpx 80rpx;
+		height: 650rpx;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: flex-start;
+		box-sizing: border-box;
+		.coupon-item{
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			margin-bottom: 16rpx;
+			height:170rpx;
+			&:last-child{
+				margin-bottom: 0rpx;
+			}
+			.left{
+				 color: #fff;
+				font-size: 36rpx;
+				font-weight: bold;
+				text-align: center;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				width: 230rpx;
+				image{
+					position: absolute;
+					width: 230rpx;
+					height:170rpx;
+					color: #fff;
+				}
+				.num{
+					font-size: 40rpx;
+				}
+				.pic-num{
+					font-size: 20rpx;
+					z-index: 99;
+				}
+			}
+			.right{
+				
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: flex-start;
+				height:170rpx;
+				width: calc(100% - 230rpx);
+				padding: 0 17rpx 0 24rpx;
+				background-color: #fff;
+				box-sizing: border-box;
+				.title{
+					width: 100%;
+					font-size: 0.3 * 100rpx;
+					color: #282828;
+					height: 0.93 * 100rpx;
+					line-height: 0.93 * 100rpx;
+					border-bottom: 1px solid #f0f0f0;
+				}
+				.btns{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					width: 100%;
+					font-size: 0.2 * 100rpx;
+					color: #999;
+					height: 0.76 * 100rpx;
+					.btn{
+						width: 1.36 * 100rpx;
+						height: 0.44 * 100rpx;
+						border-radius: 0.22 * 100rpx;
+						font-size: 0.22 * 100rpx;
+						color: #fff;
+						text-align: center;
+						line-height: 0.44 * 100rpx;
+						background-color: #FF233C;
+						.gray{
+							 background-color: #ccc;
+						}
+					}
+					
+				}
+			}
+		}
+		
+	}
+</style>
+ 
+

pages_points/integral.vue

@@ -0,0 +1,534 @@
+<template>
+	<view>
+		<view class="top-cont">
+			<!-- 背景图片 -->
+			<image class="bg" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/jf_top_Bg.png" mode=""></image>
+			<view class="top-inner">			
+				<!-- 这里是状态栏 -->
+				<view class="fixed-top-box" :style="{ background: bg }">
+					<view class="status_bar" :style="{height: statusBarHeight}"></view>
+					<view class="back-box" @click="back">
+						<image src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/back_white.png" mode=""></image>
+						<text class="title">我的积分</text>
+						<text></text>
+					</view>
+				</view>
+				<!-- 顶部固定后站位元素 -->
+				<view style="padding-bottom: 88upx;">
+					<view :style="{height: statusBarHeight}"></view>
+				</view>
+				<!-- 可用积分 -->
+				<view class="available-points">
+					<text class="label">可用积分</text>
+					<text class="num">{{integral}}</text>
+				</view>
+				<!-- 签到 -->
+				<view class="singn-content">
+					<view class="sign-in-box">
+						<view class="inner">
+							<view class="title-box">已连续签到<text class="num">{{signNum}}</text>天</view>
+							<!-- 签到天数 -->
+							<view class="sign-list">
+								<view v-for="(item,index) in sign" :key="index"  :class="signNum >= index+ 1?'item active':'item'">
+									<view class="line"></view>
+									<view class="right">
+										<!-- 已签到图标 -->
+										<image v-if="signNum >= index+ 1" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/right_org.png" mode=""></image>
+										<!-- 未签到图标 -->
+										<image v-else src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/right_org_ling.png" mode=""></image>
+										<text class="text">{{ item.day }}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 签到按钮 -->
+						<view class="sign-btn-box"  >
+							<view class="btn" v-if="isDaySign==false" @click="doSign()">
+								<image src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/sign.png" mode=""></image>
+								<text class="text">签到</text>
+							</view>
+							<view class="btn" v-else>
+								<image src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/sign.png" mode=""></image>
+								<text class="text">已签到</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="content">
+					<!-- 积分列表 -->
+					<view class="points-cont">
+						<!-- tab切换 -->
+						<view class="pub-tab-box">
+							<view class="tab-inner">
+								<view 
+									v-for="(item,index) in tags" 
+									:key="index"
+									:class="tabIndex == item.value?'item active':'item'"
+									@click="tabChange(item)"
+								>
+									<view class="text">
+										{{ item.lable }}
+										<image v-show="tabIndex == item.value" class="tab-bg" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/tab_bg2.png" mode=""></image>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 列表 -->
+						<view class="point-list">
+							<view v-for="(item,index) in list" :key="index" class="item">
+								<view class="left">
+									<!-- <view class="title">{{item.title}}</view> -->
+									<view v-for="dict in logTypeOptions">
+										<text class="title" v-if="dict.dictValue==item.logType">{{dict.dictLabel}}</text>
+									</view>
+									<view class="time">{{item.createTime}}</view>
+								</view>
+								<view class="right">
+									<text v-if="item.integral<0" class="less">{{item.integral}}</text>
+									<text v-else class="add">+{{item.integral}}</text>
+								</view>
+							</view>
+						</view>
+						<Loading :loaded="loaded" :loading="loading"></Loading>
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import {getDictByKey} from '@/api/common.js'
+	import {getUserSign,getIntegral,doSign} from '@/api/userSign'
+	import Loading from "@/components/Loading";
+	export default {
+		components: {
+		  Loading,
+		},
+		data() {
+			return {
+				isDaySign:false,
+				top:0,
+				signNum:0,
+				integral:0,
+				sign:[],
+				// 状态栏的高度
+				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
+				// tab切换 0全部 1获得 2消耗
+				tags: [{lable:'全部',value:0},{lable:'获得',value:1},{lable:'消耗',value:2}],
+				// 选中的tab
+				tabIndex: 0,
+	
+				current: 0,
+				page: {
+				  type:0,
+				  page: 1,
+				  pageSize: 10
+				},
+				list: [],
+				loaded: false,
+				loading: false,
+				logTypeOptions: []
+			};
+		},
+		onLoad(option) {
+			this.getDictByKey("sys_integral_log_type");
+			this.getUserSign()
+			this.getIntegral()
+		},
+		onReachBottom() {
+		  !this.loading && this.getIntegral();
+		},
+		onPageScroll(e) {
+			if(e.scrollTop > 30) {
+				this.topFixed = true
+			} else {
+				this.topFixed = false
+			}
+		},
+		onPageScroll(e) {
+			this.top=e.scrollTop;
+		},
+		computed: {
+			// 计算属性的 getter
+			bg: function() {
+				return 'rgba(255,142,60, ' + this.top / 30 + ')';
+			},
+		},
+		methods: {
+			doSign(){
+				var data={};
+				uni.showLoading({
+					title:"正在加载中..."
+				})
+				doSign(data).then(
+					res => {
+						uni.hideLoading()
+						if(res.code==200){
+							uni.showToast({
+								icon:'success',
+								title: res.msg,
+							});
+							this.list=[];
+							this.page.page=1;
+							this.list=[];
+							this.loaded=false;
+							this.loading=false;
+							this.getIntegral();
+							this.getUserSign();
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			getUserSign(){
+				getUserSign().then(
+					res => {
+						if(res.code==200){
+							this.data=res.member;
+							this.signNum=res.signNum;
+							this.isDaySign=res.isDaySign;
+							this.integral=res.integral;
+							this.sign=JSON.parse(res.sign);
+							
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			getIntegral() {
+			  let that = this;
+			  if (that.loaded == true || that.loading == true) return;
+			  that.loading = true;
+			  uni.showLoading({
+			  	title:"加载中..."
+			  })
+			  getIntegral(that.page).then(
+			    res => {
+			      that.loading = false;
+			      that.loaded = res.data.list.length < that.page.pageSize;
+			      that.page.page = that.page.page + 1;
+			      that.list.push.apply(that.list, res.data.list);
+				  uni.hideLoading()
+			    },
+			    err => {
+					uni.hideLoading()
+					uni.showToast({
+							title: err.msg ,
+							icon: 'none',
+							duration: 2000
+						});
+			    }
+			  );
+			},
+			getDictByKey(key){
+				var data={key:key}
+				getDictByKey(data).then(
+					res => {
+						if(res.code==200){
+							console.log("key",res)
+							if(key=="sys_integral_log_type"){
+								this.logTypeOptions=res.data;
+							}
+						}
+					},
+					err => {
+					}
+				);
+				
+			},
+			// 返回上一页
+			back() {
+				uni.navigateBack()
+			},
+			// tab选择
+			tabChange(item) {
+				console.log(item)
+				this.tabIndex = item.value
+				this.page.type=this.tabIndex;
+				this.page.page=1;
+				this.list=[];
+				this.loaded=false;
+				this.loading=false;
+				this.getIntegral();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.fixed-top-box{
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1000;
+		transition: all 0.5s;
+		 
+	}
+	.top-cont{
+		width: 100%;
+		height: 654upx;
+		position: relative;
+		.bg{
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 1;
+		}
+		.top-inner{
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+			.back-box{
+				height: 88upx;
+				padding-left: 22upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 20upx;
+				image{
+					width: 40upx;
+					height: 40upx;
+				}
+				.title{
+					font-size: 36upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+			.available-points{
+				margin-top: 40upx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				.label{
+					font-size: 30upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FFFFFF;
+					line-height: 1;
+				}
+				.num{
+					font-size: 80upx;
+					font-family: Gilroy;
+					font-weight: 500;
+					color: #FFFFFF;
+					line-height: 1;
+					margin-top: 28upx;
+				}
+			}
+			.singn-content{
+				padding: 0 20upx;
+				margin-top: 50upx;
+			}
+			.sign-in-box{
+				height: 380upx;
+				background: #FFFFFF;
+				border-radius: 16upx;
+				.inner{
+					padding: 40upx 30upx;
+					.title-box{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+						line-height: 1;
+						.num{
+							font-size: 32upx;
+							font-family: PingFang SC;
+							font-weight: Bold;
+							color: #FF7511;
+							margin: 0 10upx;
+							line-height: 1;
+						}
+					}
+					.sign-list{
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						margin-top: 40upx;
+						.item{
+							display: flex;
+							justify-content: center;
+							.right{
+								display: flex;
+								flex-direction: column;
+								align-items: center;
+								justify-content: center;
+								image{
+									width: 44upx;
+									height: 44upx;
+									margin-bottom: 20upx;
+								}
+								.text{
+									font-size: 24upx;
+									font-family: PingFang SC;
+									font-weight: 500;
+									color: #FF7511;
+									line-height: 1;
+									white-space: nowrap;
+								}
+							}
+							.line{
+								width: 34upx;
+								height: 4upx;
+								background: #F6CDA7;
+								border-radius: 2upx;
+								margin-top: 22upx;
+							}
+							&:first-child{
+								.line{
+									display: none;
+								}
+							}
+							&.active{
+								.line{
+									background: #FF8E3C;
+								}
+							}
+						}
+					}
+				}
+				.sign-btn-box{
+					padding: 0 14upx;
+					.btn{
+						width: 100%;
+						height: 120upx;
+						background-image: url(https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/org_btn.png);
+						background-repeat: no-repeat;
+						background-size: 100% 100%;
+						display: flex;
+						justify-content: center;
+						image{
+							width: 32upx;
+							height: 32upx;
+							margin-top: 32upx;
+							margin-right: 16upx;
+						}
+						.text{
+							font-size: 30upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FFFFFF;
+							line-height: 1;
+							margin-top: 36upx;
+						}
+					}
+				}
+			}
+			
+		}
+	}
+	.content{
+		margin-top: 20upx;
+		padding: 0 20upx 40upx;
+		.points-cont{
+			
+			background-color: #FFFFFF;
+			border-radius: 16upx;
+			.pub-tab-box{
+				padding: 0 80upx;
+				.tab-inner{
+					height: 88upx;
+					line-height: 88upx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+				.item{
+					font-size: 28upx;
+					white-space: nowrap;
+					line-height: 1;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					&.active{
+						font-weight: bold;
+						color: #333333;
+					}
+					.text{
+						position: relative;
+						z-index: 1;
+					}
+					.tab-bg{
+						width: 72upx;
+						height: 28upx;
+						position: absolute;
+						top: 17upx;
+						left: 50%;
+						transform: translateX(-36upx);
+						z-index: -1;
+					}
+				}
+			}
+			.point-list{
+				padding: 0 30upx;
+				.item{
+					padding: 30upx 0;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					border-bottom: 1px solid #F0F0F0;
+					&:last-child{
+						border-bottom: none;
+					}
+					.left{
+						.title{
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #111111;
+							line-height: 1;
+						}
+						.time{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+							margin-top: 22upx;
+						}
+					}
+					.right{
+						.add{
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #111111;
+						}
+						.less{
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #F56C6C;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+</style>

pages_points/integralGoodsDetails.vue

@@ -0,0 +1,560 @@
+<template>
+	<view class="content">
+		<view class="cont-box">
+			<view class="goods-banner" @click="showImg()">
+				<view class="cartbox" @click.stop="goCart()">
+					<view class="box">
+						<u-badge type="error" max="99" :value="cartNum" bgColor="#FF233C"></u-badge>
+					</view>
+					<u-icon name="shopping-cart" color="#FF233C" size="68rpx"></u-icon>
+				</view>
+				<swiper class="swiper" :indicator-dots="false" :circular="true" :autoplay="true" :interval="3000"
+					:duration="1000" indicator-color="rgba(255, 255, 255, 0.6)" indicator-active-color="#ffffff"
+					@change="swiperChange">
+					<swiper-item class="swiper-item" v-for="(item,index) in  imgs" :key="index">
+						<image :src="item" mode="aspectFit"></image>
+					</swiper-item>
+				</swiper>
+				<!-- 数量 -->
+				<view class="num-box">{{ activeImg }}/{{ imgs.length }}</view>
+			</view>
+			<view class="integral-box">
+				<view class="title">{{items.goodsName}}</view>
+				<view class="num-box">
+					<view class="x-ac">
+						<view class="price">{{items.integral}} 积分</view>
+						<view class="price-val" v-if="items.cash>0">+{{items.cash.toFixed(2)}} 元</view>
+					</view>
+					<view class="count">价值:{{items.otPrice.toFixed(2)}}元</view>
+				</view>
+
+			</view>
+			<view class="desc-box">
+				<view class="desc" v-html="items.descs">
+				</view>
+			</view>
+		</view>
+		<view class="btn-foot">
+			<view class="p-price-box">
+				<!-- <view class="p-name">兑换积分: </view> -->
+				<view class="p-price">{{items.integral}}<text style="font-size: 20rpx;">积分</text></view>
+				<view class="p-price" v-if="items.cash > 0">+{{items.cash.toFixed(2)}}<text
+						style="font-size: 20rpx;">元</text></view>
+			</view>
+			<view class="btn-box">
+				<view class="btn add" @click="openPop">
+					加入购物车
+				</view>
+				<view class="btn buy" @click="submit()">
+					立即兑换
+				</view>
+			</view>
+		</view>
+		<u-popup :show="show" mode="bottom" closeable @close="close">
+			<view class="popbox">
+				<view class="x-f">
+					<image class="popbox-img" :src="items.imgUrl" mode="aspectFill"></image>
+					<view class="info-text">
+						<view class="price">
+							<text class="unit">¥</text>
+							<text class="num">{{items.cash.toFixed(2)}}</text>
+							<text class="oldprice"> ¥{{items.otPrice.toFixed(2)}}</text>
+						</view>
+						<view class="text es-mt-16">所需积分：{{items.integral}}</view>
+						<view class="desc-box es-mt-16">
+							<text class="text">库存：{{items.stock>0?items.stock:'售罄'}} </text>
+						</view>
+					</view>
+				</view>
+				<!-- 数量 -->
+				<view class="price-num x-bc" style="margin-top: 30rpx;">
+					<view class="label">数量</view>
+					<view class="num-box">
+						<u-number-box v-model="num" integer :step="1" :min="1" :max="100000"></u-number-box>
+					</view>
+				</view>
+				<view class="es-max-btn x-c" @click="addCart">
+					加入购物车
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getIntegralGoodsById,
+		createOrder,
+		addOrUpdateCart,
+		getCartCount
+	} from '@/api/integral.js'
+	export default {
+		data() {
+			return {
+				imgs: [],
+				activeImg: 1,
+				goodsId: null,
+				items: {
+					cash: 0, 
+					otPrice: 0, 
+					integral: 0, 
+					goodsName: '', 
+					imgUrl: '',
+					stock: 0, 
+					descs: ''
+				},
+				show: false,
+				num: 1,
+				cartNum: 0
+			};
+		},
+		onLoad(option) {
+			this.goodsId = option.goodsId;
+		},
+		onShow() {
+			this.getIntegralGoodsById();
+			this.getcartNum()
+		},
+		methods: {
+			goCart() {
+				uni.navigateTo({
+					url: './cart'
+				})
+			},
+			getcartNum() {
+				getCartCount().then(res => {
+					if (res.code == 200) {
+						this.cartNum = res.data || 0
+					}
+				})
+			},
+			close() {
+				this.show = false
+			},
+			openPop() {
+				this.num = 1
+				this.show = true
+			},
+			addCart() {
+				if(this.cartNum>=this.items.stock){
+					uni.showToast({
+						title: '库存不足',
+						icon: 'none'
+					})
+					this.show = false
+					return;
+				}
+				uni.showLoading({
+					title: '处理中'
+				})
+				addOrUpdateCart({
+					cartNum: this.num,
+					goodsId: this.goodsId,
+					isCart: 0
+				}).then(res => {
+					uni.hideLoading()
+					if (res.code == 200) {
+						this.show = false
+						uni.showToast({
+							title: '加入购物车成功',
+							icon: 'none'
+						})
+						this.getcartNum()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			submit() {
+				this.utils.isLogin().then(
+					res => {
+						if (res) {
+							uni.navigateTo({
+								url: "./integralOrderPay?goodsId=" + this.goodsId
+							})
+						} else {
+							uni.navigateTo({
+								url: '/pages/auth/login'
+							})
+						}
+					}
+				);
+			},
+			swiperChange(event) {
+				this.activeImg = event.detail.current + 1
+			},
+
+			showImg() {
+				//预览图片
+				uni.previewImage({
+					urls: this.imgs,
+					current: this.imgs[0]
+				});
+			},
+			getIntegralGoodsById() {
+				let data = {
+					goodsId: this.goodsId
+				};
+				getIntegralGoodsById(data).then(
+					res => {
+						if (res.code == 200) {
+							this.items = res.data;
+							console.log("全部是", this.items)
+							if (res.data.images != null) {
+								this.imgs = res.data.images.split(",")
+							} else {
+								this.activeImg = 0;
+							}
+							console.log(this.imgs)
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.cartbox {
+		position: fixed;
+		bottom: 180rpx;
+		right: 20rpx;
+		z-index: 99;
+		background-color: #fff;
+		box-shadow: 0 2px 4px rgba(150, 150, 150, 0.6);
+		padding: 10rpx;
+		border-radius: 50%;
+
+		.box {
+			position: absolute;
+			top: -10rpx;
+			right: 0;
+			z-index: 99;
+		}
+	}
+
+	.es-mt-16 {
+		margin-top: 16rpx;
+	}
+
+	.content {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+
+		.cont-box {
+			padding-bottom: 121rpx;
+
+			.integral-box {
+				background-color: #fff;
+				padding: 20rpx;
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: flex-start;
+
+				.title {
+					font-weight: bold;
+					font-size: 34rpx;
+					font-family: PingFang SC;
+					color: #111;
+				}
+
+				.desc {
+					margin-top: 15rpx;
+					display: flex;
+					align-items: flex-start;
+					justify-content: flex-start;
+
+					.cycle {
+						background-color: #eee;
+						border-radius: 30rpx;
+						padding: 5rpx 15rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						color: #FF233C;
+					}
+
+					.duration {
+						margin-left: 10rpx;
+						background-color: #eee;
+						border-radius: 30rpx;
+						padding: 5rpx 15rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						color: #FF233C;
+					}
+
+				}
+
+				.num-box {
+					margin-top: 15rpx;
+					flex: 1;
+					display: flex;
+					align-items: flex-end;
+					justify-content: space-between;
+					width: 100%;
+
+					.price {
+						padding: 5rpx 10rpx;
+						background-color: #FF233C;
+						border-radius: 30rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						color: #ffffff;
+					}
+
+					.price-val {
+						font-weight: bold;
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						color: #FF233C;
+					}
+
+					.count {
+						font-size: 24rpx;
+						font-family: PingFang SC;
+						color: #333333;
+					}
+
+				}
+
+
+			}
+
+			.desc-box {
+				background-color: #fff;
+				padding: 20rpx;
+				margin-top: 10rpx;
+
+				.title-box {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+
+					.title {
+						font-size: 32rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #111111;
+					}
+
+					.line {
+						margin-right: 15rpx;
+						height: 30rpx;
+						width: 6rpx;
+						background-color: #FF233C;
+
+					}
+
+				}
+
+				.desc {
+					margin-top: 15rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					color: #9a9a9c;
+				}
+			}
+
+		}
+	}
+
+	.btn-foot {
+		box-sizing: border-box;
+		width: 100%;
+		height: 121rpx;
+		background: #FFFFFF;
+		padding: 0 32rpx 0 28rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+
+		.p-price-box {
+			.p-name {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+			}
+
+			.p-price {
+				margin-left: 10rpx;
+				color: #FF6633;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+
+			}
+		}
+
+		.btn-box {
+			display: flex;
+			align-items: center;
+
+			.btn {
+				width: 200rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				text-align: center;
+				border-radius: 44rpx;
+				margin-left: 20rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FFFFFF;
+
+				&:first-child {
+					margin-left: 0;
+				}
+
+				&.buy {
+					background: #FF233C;
+				}
+
+				&.add {
+					color: #FF233C !important;
+					border: 1rpx solid #FF233C;
+				}
+			}
+
+		}
+	}
+
+	.goods-banner {
+		height: 756rpx;
+		background-color: #FFFFFF;
+		position: relative;
+
+		.swiper-item {
+			box-sizing: border-box;
+		}
+
+		.swiper,
+		.swiper-item,
+		.swiper-item image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.num-box {
+			width: 80rpx;
+			height: 44rpx;
+			line-height: 44rpx;
+			text-align: center;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			background: rgba(0, 0, 0, .3);
+			border-radius: 22rpx;
+			position: absolute;
+			right: 30rpx;
+			bottom: 30rpx;
+			z-index: 10;
+		}
+	}
+
+	.popbox {
+		padding: 40rpx 32rpx;
+
+		&-img {
+			width: 200rpx;
+			height: 200rpx;
+			border-radius: 20rpx;
+			margin-right: 24rpx;
+		}
+
+		.oldprice {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			margin-top: 27rpx;
+			line-height: 1;
+			text-decoration: line-through;
+			margin-left: 24rpx;
+		}
+
+		.info-text {
+			height: 200rpx;
+
+			.price {
+				display: flex;
+				align-items: flex-end;
+
+				.unit {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF233C;
+					line-height: 1.2;
+					margin-right: 10rpx;
+				}
+
+				.num {
+					font-size: 50rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF233C;
+					line-height: 1;
+				}
+			}
+
+			.text {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FF233C;
+			}
+
+			.desc-box {
+				display: flex;
+				flex-direction: column;
+				padding-bottom: 9rpx;
+
+				.text {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					margin-top: 27rpx;
+					line-height: 1;
+
+					&:first-child {
+						margin-top: 0;
+					}
+				}
+			}
+		}
+	}
+
+	.es-max-btn {
+		width: 100%;
+		background-color: #FF233C;
+		border-radius: 60rpx;
+		margin-top: 50rpx;
+		color: #fff;
+		padding: 20rpx 0;
+		box-sizing: border-box;
+	}
+</style>

pages_points/integralGoodsList.vue

@@ -0,0 +1,637 @@
+<template>
+	<view class="content">
+		<image class="bg" src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/backbg.png"></image>
+		<view class="header-nav"
+			:style="{ height: `calc(88rpx + ${statusBarHeight}px)`, paddingTop: statusBarHeight + 'px' }">
+			<view class="arrow-left-warning" @click="goBack()">
+				<u-icon name="arrow-left" size='22' color="#222" bold></u-icon>
+			</view>
+			<view class="header-title">积分商城</view>
+		</view>
+		<view class="cont-box">
+			<view class="top-box" :style="{ paddingTop: statusBarHeight + 44 + 'px' }">
+				<view class="my-integral">
+					<view class="left">
+						<view class="label">我的积分</view>
+						<view class="integral">{{ integral }}</view>
+					</view>
+					<view class="btn-box">
+						<view class="btn" @click="loginNavTo('/pages_points/integralLogsList')">
+							<image
+								src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/integralLogs.png">
+							</image>
+							获得记录
+						</view>
+						<view style="height: 40rpx;border: 1rpx solid #D8D8D8;"></view>
+						<view class="btn" style="margin-bottom: 0;"
+							@click="loginNavTo('/pages_points/integralOrderList')">
+							<image
+								src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/exchange.png">
+							</image>
+							兑换订单
+						</view>
+					</view>
+					<view class="search-cont">
+						<view class="inner">
+							<image class="icon-search" src="@/static/images/icon-search.png" mode=""></image>
+							<input type="text" @confirm="goSearch" :value="keyWord" placeholder="搜索商品"
+								placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
+						</view>
+					</view>
+				</view>
+				<!-- <view class="navbox">
+					<view class="navbox-item" @click="goCart()">
+						<view class="box">
+							<u-badge type="error" max="99" :value="cartNum" bgColor="#FF233C"></u-badge>
+						</view>
+						<image src="/static/images/cart_sel.png" mode="aspectFill"></image>
+						<text>购物车</text>
+					</view>
+					<view class="navbox-item" @click="handleOrder(0)">
+						<image src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/payment.png" mode="aspectFill"></image>
+						<text>全部订单</text>
+					</view>
+					
+					<view class="navbox-item" @click="handleOrder(1)">
+						<image src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/send_goods.png" mode="aspectFill"></image>
+						<text>待发货</text>
+					</view>
+					<view class="navbox-item" @click="handleOrder(3)">
+						<image src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/sou_goods.png" mode="aspectFill"></image>
+						<text>已完成</text>
+					</view>
+					<view class="navbox-item" @click="handleOrder(4)">
+						<image src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/after_sales.png" mode="aspectFill"></image>
+						<text>已取消</text>
+					</view>
+				</view> -->
+				<view class="tabs" v-if="tabs.length > 0">
+					<u-tabs :current="tabIndex" :scrollable="true" :list="tabs" lineColor="#F4F6F7"
+						inactiveStyle="font-size: 40rpx;color: #222"
+						activeStyle="font-size: 40rpx;font-weight:bold;color: #FF233C;" @change="tabChange">
+					</u-tabs>
+				</view>
+			</view>
+			<mescroll-body top="610rpx" bottom="0" ref="mescrollRef" @init="mescrollInit" @down="downCallback"
+				@up="upCallback" :down="downOption" :up="upOption">
+				<view class="integral-box">
+					<view class="item" @click="navTo('/pages_points/integralGoodsDetails?goodsId=' + item.goodsId)"
+						v-for="(item, index) in dataList">
+						<view class="top">
+							<image :src="item.imgUrl"></image>
+						</view>
+						<view class="bottom">
+							<view class="title ellipsis2">
+								{{ item.goodsName }}
+							</view>
+							<view class="price-box">
+								<view class="price">{{ item.integral }}积分</view>
+								<view class="price-val" v-if="item.cash > 0">+{{ item.cash.toFixed(2) }}<text
+										style="font-size: 20rpx;font-weight: normal;">元</text></view>
+								<!-- <view class="count">价值:{{item.otPrice.toFixed(2)}}元</view> -->
+							</view>
+						</view>
+					</view>
+				</view>
+			</mescroll-body>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import { getStoreDictByKey } from '@/api/common.js'
+import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+// import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+import { getIntegralGoodsList, getCartCount } from '@/api/integral.js'
+import { getUserInfo } from '@/api/user'
+export default {
+	mixins: [MescrollMixin],
+	data() {
+		return {
+			integral: 0,
+			type: null,
+			typeOptions: [],
+			tabIndex: 0,
+			tabs: [],
+			mescroll: null,
+			downOption: {   //下拉刷新
+				use: true,
+				auto: false // 不自动加载 (mixin已处理第一个tab触发downCallback)
+			},
+			keyWord: '',
+			upOption: {
+				onScroll: false,
+				use: true, // 是否启用上拉加载; 默认true
+				page: {
+					pae: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+					size: 10 // 每页数据的数量,默认10
+				},
+				noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+				textNoMore: "已经到底了",
+				empty: {
+					icon: 'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/empty_icon.png',
+					tip: '暂无数据'
+				}
+			},
+			dataList: [],
+			top: 0,
+			cartNum: 0,
+			statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+		}
+	},
+	onLoad() {
+		this.getDictByKey("sys_integral_goods_type");
+		if (this.$isLogin()) {
+			this.getUserInfo();
+		}
+	},
+	onReady() {
+		this.getTop()
+	},
+	onShow() {
+		if (this.$isLogin()) {
+			this.getcartNum()
+		}
+	},
+	methods: {
+		goBack() {
+			uni.navigateBack();
+		},
+		goSearch(e) {
+			this.keyWord = e.detail.value;
+			this.mescroll.resetUpScroll();
+		},
+		goCart() {
+			if (this.$isLogin()) {
+				const url = './cart'
+				uni.navigateTo({
+					url: url
+				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/auth/login'
+				})
+			}
+		},
+		getcartNum() {
+			getCartCount().then(res => {
+				if (res.code == 200) {
+					this.cartNum = res.data || 0
+				}
+			})
+		},
+		getTop() {
+			const query = uni.createSelectorQuery().in(this);
+			query
+				.select(".top-box")
+				.boundingClientRect((data) => {
+					if (data) {
+						this.top = data.height + uni.upx2px(88)
+					}
+				})
+				.exec();
+		},
+		handleOrder(current) {
+			if (this.$isLogin()) {
+				uni.navigateTo({
+					url: '/pages_points/integralOrderList?current=' + current
+				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/auth/login'
+				})
+			}
+		},
+		getUserInfo() {
+			getUserInfo().then(
+				res => {
+					if (res.code == 200) {
+						if (res.user != null) {
+							this.integral = res.user.integral;
+						}
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: "请求失败",
+						});
+					}
+				},
+				rej => { }
+			);
+		},
+		loginNavTo(url) {
+			if (this.$isLogin()) {
+				uni.navigateTo({
+					url: url
+				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/auth/login'
+				})
+			}
+		},
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			})
+		},
+		getDictByKey(key) {
+			var data = { key: key }
+			var that = this;
+			getStoreDictByKey(data).then(
+				res => {
+					if (res.code == 200) {
+						this.typeOptions = res.data;
+						this.typeOptions.forEach(function (item, index) {
+							var data = { name: item.dictLabel };
+							that.tabs.push(data);
+						})
+						this.tabs.unshift({ name: '全部' })
+						if (this.tabs.length > 0) {
+							this.tabIndex = 0
+						}
+
+					}
+				},
+				err => {
+				}
+			);
+
+		},
+		tabChange(item) {
+			this.tabIndex = item.index
+			this.type = item.index == 0 ? null : this.typeOptions[item.index - 1].dictValue;
+			this.mescroll.resetUpScroll()
+		},
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+		},
+		/*下拉刷新的回调 */
+		downCallback(mescroll) {
+			mescroll.resetUpScroll()
+		},
+		upCallback(page) {
+			//联网加载数据
+			var that = this;
+			var data = {
+				pageNum: page.num,
+				pageSize: page.size,
+				keyword: this.keyWord
+			};
+			if (this.typeOptions && this.typeOptions.length > 0) {
+				this.type = this.tabIndex == 0 ? null : this.typeOptions[this.tabIndex - 1].dictValue;
+			}
+			if (this.type != null) {
+				data.goodsType = this.type
+			}
+			getIntegralGoodsList(data).then(res => {
+				if (res.code == 200) {
+					//设置列表数据
+					if (page.num == 1) {
+						that.dataList = res.data.list;
+
+					} else {
+						that.dataList = that.dataList.concat(res.data.list);
+
+					}
+					that.mescroll.endBySize(res.data.list.length, res.data.total);
+
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: "请求失败",
+					});
+					that.dataList = null;
+					that.mescroll.endErr();
+				}
+			});
+		}
+
+	}
+}
+
+
+</script>
+
+<style>
+page {
+	height: 100%;
+	background: #F4F6F7;
+}
+</style>
+<style scoped lang="scss">
+@mixin u-flex($flexD, $alignI, $justifyC) {
+	display: flex;
+	flex-direction: $flexD;
+	align-items: $alignI;
+	justify-content: $justifyC;
+}
+
+.bg {
+	width: 100%;
+	height: 460rpx;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 9;
+}
+
+.header-nav {
+	height: 88rpx;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+	//background-color: #fff;
+	box-sizing: border-box;
+	position: fixed;
+	width: 100%;
+	z-index: 9999;
+
+	.header-title {
+		text-align: center;
+		margin-right: 0;
+		//padding: 0 10rpx 0 100rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #000;
+		box-sizing: border-box;
+	}
+}
+
+.arrow-left-warning {
+	position: absolute;
+	left: 24rpx;
+	height: 88rpx;
+	overflow: hidden;
+	color: #888;
+	font-size: 24rpx;
+	z-index: 999;
+	@include u-flex(column, center, center);
+
+	image {
+		flex-shrink: 0;
+		height: 36rpx;
+		width: 36rpx;
+	}
+}
+
+.navbox {
+	@include u-flex(row, center, space-between);
+	padding: 26rpx;
+	background: #FFFFFF;
+	border-radius: 16rpx 16rpx 16rpx 16rpx;
+	font-size: 24rpx;
+
+	&:last-child {
+		margin-right: 0;
+	}
+
+	&-item {
+		flex: 1;
+		margin-right: 18rpx;
+		@include u-flex(column, center, center);
+		position: relative;
+	}
+
+	&-iteminfo {
+		// width: 162rpx;
+		// height: 162rpx;
+		width: 100%;
+		padding: 24rpx;
+		box-sizing: border-box;
+		background: rgba(255, 255, 255, 0.7);
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		@include u-flex(row, center, center);
+		font-size: 26rpx;
+		color: #222222;
+	}
+
+	image {
+		width: 48rpx;
+		height: 48rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.box {
+		position: absolute;
+		top: -10rpx;
+		right: 0;
+		z-index: 99;
+	}
+}
+
+.search-cont {
+	padding: 24rpx;
+	width: 100%;
+	background-color: #F4F6F7;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+
+	.inner {
+		box-sizing: border-box;
+		width: 100%;
+		height: 76rpx;
+		background: #FFFFFF;
+		border-radius: 38rpx;
+		display: flex;
+		align-items: center;
+
+		//padding: 0 20rpx;
+		.icon-search {
+			width: 44rpx;
+			height: 44rpx;
+			margin-right: 12rpx;
+		}
+
+		input {
+			height: 76rpx;
+			line-height: 76rpx;
+			font-size: 32rpx;
+			flex: 1;
+		}
+
+	}
+
+	.icon-search {
+		margin-left: 20rpx;
+		width: 44rpx;
+		height: 44rpx;
+
+		image {
+			width: 44rpx;
+			height: 44rpx;
+		}
+
+	}
+}
+
+.content {
+	height: 100%;
+
+	.cont-box {
+		.top-box {
+			z-index: 999;
+			// padding: 24rpx 24rpx 0 24rpx;
+			width: 100%;
+			position: fixed;
+			left: 0rpx;
+
+			//background-color: #f5f5f5;
+			.my-integral {
+				//box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
+				//background: linear-gradient(#2BC7B9, #a0f6ff);
+				//border-radius: 30rpx;
+				display: flex;
+				align-items: flex-start;
+				// justify-content: space-between;
+				flex-direction: column;
+
+				// padding: 30rpx;
+				//margin-bottom: 24rpx;
+				.left {
+					padding: 20rpx 40rpx;
+
+					.label {
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 40rpx;
+						color: #FFFFFF;
+						line-height: 56rpx;
+					}
+
+					.integral {
+						margin-top: 20rpx;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 500;
+						font-size: 64rpx;
+						color: #FFFFFF;
+						line-height: 90rpx;
+					}
+				}
+
+				.btn-box {
+					margin-top: 30rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+					background-color: #fff;
+					border-radius: 24rpx;
+					width: calc(100vw - 48rpx);
+					margin-left: 24rpx;
+					padding: 30rpx 50rpx;
+
+					.btn {
+						//margin-bottom: 30rpx;
+						//background-color: #fff;
+						//border-radius: 30rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						//padding: 30rpx 50rpx;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 500;
+						font-size: 32rpx;
+						color: #000000;
+						line-height: 44rpx;
+
+						image {
+							width: 100rpx;
+							height: 100rpx;
+							margin-right: 20rpx;
+						}
+					}
+				}
+			}
+
+			.tabs {
+				height: 88rpx;
+				background: #F4F6F7;
+			}
+		}
+
+		.integral-box {
+			margin-top: 40rpx;
+			padding: 30rpx;
+			display: flex;
+			align-items: flex-start;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+
+			.item {
+				box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
+				background-color: #fff;
+				width: calc(50% - 20rpx);
+				border-radius: 15rpx;
+				margin: 10rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: flex-start;
+
+				&:last-child {}
+
+				.top {
+					width: 100%;
+					height: 300rpx;
+
+					image {
+						border-radius: 15rpx 15rpx 0rpx 0rpx;
+						width: 100%;
+						height: 300rpx;
+					}
+
+				}
+
+				.bottom {
+					width: 100%;
+					padding: 15rpx;
+
+					.title {
+						font-weight: bold;
+						font-size: 28upx;
+						font-family: PingFang SC;
+						color: #111111;
+					}
+
+					.price-box {
+						margin-top: 10rpx;
+						display: flex;
+						align-items: center;
+						// justify-content: space-between;
+						width: 100%;
+
+						.price {
+							padding: 5rpx 10rpx;
+							background-color: #FF233C;
+							border-radius: 30rpx;
+							font-size: 20upx;
+							font-family: PingFang SC;
+							color: #ffffff;
+						}
+
+						.price-val {
+							font-size: 28rpx;
+							font-weight: bold;
+							font-family: PingFang SC;
+							color: #FF233C;
+						}
+
+						.count {
+							font-size: 24upx;
+							font-family: PingFang SC;
+							color: #333333;
+						}
+
+					}
+				}
+			}
+		}
+	}
+}
+</style>

pages_points/integralLogsList.vue

@@ -0,0 +1,177 @@
+<template>
+	<view class="page">
+		<view class="content">
+			<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+			<view class="item" v-for="(item) in dataList" :key="item.id">
+				<view class="left">
+					<!-- <text class="title"  >
+						完课积分领取记录
+					</text> -->
+					<text class="title">
+						{{$getDictLabel2Name(typeOptions,item.logType)}}
+					</text>
+					<view class="time">{{item.createTime}}</view>
+				</view>
+				<view class="right">
+					<text  :class="item.integral>0?'money green':'money red'">{{item.integral}}</text>
+					<text class="remark">剩余积分:{{item.balance}}</text>
+				</view>
+			</view>
+			</mescroll-body>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getStoreDictByKey} from '@/api/common.js'
+	import {getUserIntegralLogsList} from '@/api/integral.js'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				typeOptions:[],
+				mescroll:null,
+				downOption: {
+					auto:false//不要自动加载
+				},
+				upOption: {
+					onScroll:false,
+					use: true, // 是否启用上拉加载; 默认true
+					page: {
+						num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					textNoMore:"已经到底了",
+					empty: {
+						icon:'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/empty_icon.png',
+						tip: '暂无数据'
+					}
+				},
+				dataList: []
+				 
+			}
+		},
+		onLoad() {
+			this.getDictByKey("sys_integral_log_type");
+		},
+		methods: {
+			getDictByKey(key){
+				var data={key:key}
+				getStoreDictByKey(data).then(
+					res => {
+						if(res.code==200){
+							this.typeOptions=res.data;
+						}
+					},
+					err => {
+					}
+				);
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			/*下拉刷新的回调 */
+			downCallback(mescroll) {
+				mescroll.resetUpScroll()
+			},
+			upCallback(page) {
+				//联网加载数据
+				var that = this;
+				var data = {
+					pageNum: page.num,
+					pageSize: page.size
+				};
+				// uni.showLoading({
+				// 	title:"加载中..."
+				// })
+				getUserIntegralLogsList(data).then(res => {
+					uni.hideLoading()
+					if(res.code==200){
+						//设置列表数据
+						if (page.num == 1) {
+							that.dataList = res.data.list; 
+							
+						} else {
+							that.dataList = that.dataList.concat(res.data.list);
+							 
+						}
+						that.mescroll.endBySize(res.data.list.length, res.data.total);
+						
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+						that.dataList = null;
+						that.mescroll.endErr();
+					}
+				});
+			},
+			 
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page{
+	}
+	.content{
+		display: flex;
+		flex-direction: column;
+		.item{
+			background-color: #fff;
+			padding: 20rpx 24rpx;
+			display: flex;
+			align-items: flex-start;
+			justify-content: space-between;
+			border-top: 1rpx solid #efefef;
+			.left{
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: flex-start;
+				.title{
+					font-size: 26rpx;
+					color: #111;
+				}
+				.time{
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					color: #a5a5a5;
+				}
+			}
+			.right{
+				display: flex;
+				flex-direction: column;
+				align-items: flex-end;
+				justify-content: flex-end;
+				.money{
+					font-size: 28rpx;
+					font-weight: bold;
+					color: #111;
+				}
+				.green{
+					color: green;
+				}
+				.red{
+					color:#ff0000;
+				}
+				.remark{
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					color: #a5a5a5;
+					.green{
+						color: green;
+					}
+					.red{
+						color: red;
+					}
+				}
+			}
+		}
+		
+	}
+	 
+</style>

pages_points/integralOrderDetails.vue

@@ -0,0 +1,601 @@
+<template>
+	<view>
+		<view class="cont">
+			<view class="bg"></view>
+			<view class="inner">			
+				<!-- 订单状态 -->
+				<view class="order-status">
+					<!-- 待付款 -->
+					<view v-if="order.status == 4" class="inner">
+						<view class="img-box">
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/order_success.png" mode=""></image>
+						</view>
+						<view class="status-box">
+							<text class="status">待付款</text>
+							<text class="desc">请尽快完成支付</text>
+						</view>
+					</view>
+					<!-- 待发货 -->
+					<view v-if="order.status == 1" class="inner">
+						<view class="img-box">
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/order_dfh.png" mode=""></image>
+						</view>
+						<view class="status-box">
+							<text class="status">待发货</text>
+							<text class="desc">等待后台发货</text>
+						</view>
+					</view>
+					<!-- 已发货、待收货 -->
+					<view v-if="order.status == 2" class="inner">
+						<view class="img-box">
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/order_dfh.png" mode=""></image>
+						</view>
+						<view class="status-box">
+							<text class="status">待收货</text>
+							<text class="desc">运输中</text>
+						</view>
+					</view>
+					<!-- 已完成 -->
+					<view v-if="order.status == 3" class="inner">
+						<view class="img-box">
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/order_ywc.png" mode=""></image>
+						</view>
+						<view class="status-box">
+							<text class="status">已完成</text>
+							<text class="desc">订单已确认收货，交易完成</text>
+						</view>
+					</view>
+					<!--交易取消 -->
+					<view v-if="order.status == 5" class="inner">
+						<view class="img-box">
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/order_close.png" mode=""></image>
+						</view>
+						<view class="status-box">
+							<text class="status">交易关闭</text>
+							<text class="desc">订单已取消</text>
+						</view>
+					</view>
+					 
+				</view>
+				<!-- 下单人信息 -->
+				<view class="order-placer" v-if="order.userName!=null">
+					<view class="inner">
+						<image class="location" src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/location.png" mode=""></image>
+						<view class="info">
+							<view class="name-phone">
+								<text class="text">{{order.userName}}</text>
+								<text class="text" v-if="order.userPhone!=null">{{order.userPhone}}</text>
+							</view>
+							<view class="address ellipsis2">
+								{{order.userAddress}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="content">
+					<view class="goods-list">
+						<view   class="item" v-for="(item,index) in list" :key="index" >
+							<view class="img-box">
+								<image :src="item.imgUrl==''?'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/drug.svg':item.imgUrl" mode="aspectFill"></image>
+							</view>
+							<view class="info-box">
+								<view>
+									<view class="name-box ellipsis2">
+										 {{item.goodsName}}
+									</view>
+								</view>
+								<view class="price-num">
+									<view class="price">
+										<text class="num">{{item.integral}}</text>
+										<text class="unit">积分</text>
+										<text class="num" v-show="item.cash>0">+{{item.cash.toFixed(2)}}</text>
+										<text class="unit" v-show="item.cash>0">元</text>
+									</view>
+									<view class="num"  >x{{item.num}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 订单信息 -->
+					<view class="order-info">
+						<view class="title">订单信息</view>
+						<view class="item">
+							<text class="label">订单编号</text>
+							<view class="sn-box">
+								<text class="text">{{order.orderCode}}</text>
+								<view class="copy-btn" @click="copyOrderSn(order.orderCode)">复制</view>
+							</view>
+						</view>
+						<view class="item">
+							<text class="label">下单时间</text>
+							<text class="text">{{formattedCreateTime}}</text>
+						</view>
+					 
+						<view   class="item">
+							<text class="label">使用积分</text>
+							<text class="text"  >{{order.integral}}</text>
+						</view>
+						<view   class="item" v-if="order.deliveryName!=null">
+						 	<text class="label">物流公司</text>
+						 	<text class="text"  >{{order.deliveryName}}</text>
+						</view>
+						<view   class="item" v-if="order.deliverySn!=null">
+						 	<text class="label">物流单号</text>
+						 	<text class="text"  >{{order.deliverySn}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 按钮 -->
+		<view   class="btn-box">
+			<view class="btn pay" v-if="order.status==4" @click.stop="pay()">去支付</view>
+				<view class="btn cancel" v-if="order.status==4" @click.stop="cancelPay(item)">取消订单</view>
+			<view class="btn cancel">
+				联系客服
+				<button class='contact-btn' open-type="contact">
+				</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	import {getIntegralOrderById,cannelOrder} from '@/api/integral.js'
+	export default {
+		data() {
+			return {
+				orderId:null,
+				order:{},
+				list:[],
+		 
+			};
+		},
+		onLoad(option) {
+			this.orderId = option.orderId
+		},
+		onShow() {
+			this.getIntegralOrderById()
+		},
+		computed:{
+		formattedCreateTime() {
+			if (!this.order || !this.order.createTime) return '';
+			
+			// 如果是时间戳格式
+			if (typeof this.order.createTime === 'number') {
+				const date = new Date(this.order.createTime);
+				return this.formatDate(date);
+			}
+			
+			// 如果是字符串格式，尝试解析
+			const date = new Date(this.order.createTime);
+			if (!isNaN(date.getTime())) {
+				return this.formatDate(date);
+			}
+			
+			// 如果无法解析，返回原值
+			return this.order.createTime;
+		},	
+		},
+		methods: {
+			// 日期格式化方法
+			formatDate(date) {
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+				const seconds = String(date.getSeconds()).padStart(2, '0');
+				
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
+			getIntegralOrderById(){
+				var data={orderId:this.orderId};
+				getIntegralOrderById(data).then(res => {
+					if(res.code==200){
+						this.order=res.data;
+						this.list = [].concat(JSON.parse(this.order.itemJson ?? '[]')).filter(Boolean);
+					}else{
+						uni.showToast({
+							icon:'none',
+							title: "请求失败",
+						});
+						 
+					}
+				});
+			},
+			 
+			// 复制订单编号
+			copyOrderSn(text) {
+				// 复制方法
+				uni.setClipboardData({
+					data:text,
+					success:()=>{
+						uni.showToast({
+							title:'内容已成功复制到剪切板',
+							icon:'none'
+						})
+					}
+				});
+			},
+			pay() {
+				 uni.navigateTo({
+				 	url: '/pages_points/integralPayment?orderId='+this.order.orderId
+				 })
+			},
+			cancelPay() {
+				cannelOrder({orderId:this.order.orderId}).then(res=>{
+					if(res.code ==200) {
+						uni.showToast({
+							title: '取消成功',
+							icon: 'none'
+						})
+						this.getIntegralOrderById()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.cont{
+		width: 100%;
+		position: relative;
+		.bg{
+			width: 100%;
+			height: 350upx;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 1;
+			background-color: #FF233C;
+			background: linear-gradient(#FF233C, #E2C99E);
+			border-radius: 0rpx 0rpx 100rpx 100rpx;
+		}
+		.inner{
+			position: relative;
+			padding: 30upx 0rpx;
+			width: 100%;
+			height: 100%;
+			z-index: 999;
+			.order-status{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 30upx;
+				.inner{
+					display: flex;
+					align-items: center;
+					.img-box{
+						width: 96upx;
+						height: 96upx;
+						margin-right: 30upx;
+						image{
+							width: 100%;
+							height: 100%;
+						}
+					}
+					.status-box{
+						height: 96upx;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						.status{
+							font-size: 40upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FFFFFF;
+							line-height: 1;
+						}
+						.desc{
+							font-size: 26upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #FFFFFF;
+							line-height: 1;
+							margin-top: 30upx;
+						}
+					}
+				}
+			}
+			.order-placer{
+				margin-top: 30upx;
+				padding: 0 20upx;
+				.inner{
+					box-sizing: border-box;
+					border-radius: 16upx;
+					height: 150upx;
+					padding: 40upx 30upx;
+					display: flex;
+					align-items: center;
+					background: #FFFFFF;
+					.location{
+						width: 24upx;
+						height: 27upx;
+						margin-right: 18upx;
+						flex-shrink: 0;
+					}
+					.info{
+						.name-phone{
+							display: flex;
+							align-items: center;
+							.text{
+								font-size: 28upx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #333333;
+								line-height: 1;
+								margin-right: 20upx;
+								&:last-child{
+									margin-right: 0;
+								}
+							}
+						}
+						.address{
+							font-size: 26upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1.3;
+							margin-top: 10upx;
+						}
+					}
+				}
+				
+			}
+		}
+	}
+	.content{
+		margin: 20rpx 0rpx;
+		padding: 0 20upx 140rpx 20upx;
+		.goods-list{
+			padding: 0 30upx;
+			background-color: #FFFFFF;
+			border-radius: 16upx;
+			.item{
+				padding: 30upx 0;
+				border-bottom: 1px solid #EDEEEF;
+				display: flex;
+				align-items: center;
+				.img-box{
+					width: 160upx;
+					height: 160upx;
+					margin-right: 30upx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.info-box{
+					width: calc(100% - 190upx);
+					height: 160upx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					.name-box{
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #111111;
+						line-height: 40upx;
+						.tag{
+							display: inline-block;
+							padding: 0 6upx;
+							height: 30upx;
+							background: linear-gradient(90deg, #FF233C 0%, #E2C99E 100%);
+							border-radius: 4upx;
+							margin-right: 10upx;
+							font-size: 22upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FFFFFF;
+							line-height: 30upx;
+							float: left;
+							margin-top: 7upx;
+						}
+					}
+					.spec{
+						margin-top: 18upx;
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						line-height: 1;
+					}
+					.price-num{
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						.price{
+							display: flex;
+							align-items: flex-end;
+							.unit{
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								line-height: 1.2;
+								margin-right: 4upx;
+							}
+							.num{
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								line-height: 1;
+							}
+						}
+						.num{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+						}
+					}
+				}
+			}
+			.sub-total{
+				height: 88upx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				.discount{
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					line-height: 1;
+					margin-right: 30upx;
+				}
+				.label{
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+				.price{
+					display: flex;
+					align-items: flex-end;
+					.unit{
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FF6633;
+						line-height: 1.2;
+						margin-right: 4upx;
+					}
+					.num{
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #FF6633;
+						line-height: 1;
+					}
+				}
+			}
+		}
+		.order-info{
+			margin-top: 20upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			padding: 40upx 30upx;
+			.title{
+				font-size: 30upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #222222;
+				line-height: 1;
+			}
+			.item{
+				margin-top: 40upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.label{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 1;
+				}
+				.text{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #222222;
+					line-height: 32upx;
+				}
+				.cont-text{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					.bold{
+						color: #111111;
+					}
+				}
+				.sn-box{
+					display: flex;
+					align-items: center;
+					.copy-btn{
+						width: 58upx;
+						height: 32upx;
+						line-height: 32upx;
+						text-align: center;
+						font-size: 22upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #222222;
+						background: #F5F5F5;
+						border-radius: 4upx;
+						margin-left: 24upx;
+					}
+				}
+				.check-box{
+					display: flex;
+					align-items: center;
+					image{
+						width: 14upx;
+						height: 24upx;
+						margin-left: 10upx;
+					}
+				}
+			}
+			.line{
+				width: 100%;
+				height: 1px;
+				background: #F0F0F0;
+				margin-top: 30upx;
+			}
+		}
+	}
+	.btn-box{
+		z-index: 999;
+		bottom: 0;
+		width: 100%;
+		position: fixed;
+		height: 120upx;
+		box-sizing: border-box;
+		background: #FFFFFF;
+		padding: 0 30upx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		.btn{
+			position: relative;
+			width: 155upx;
+			height: 64upx;
+			line-height: 64upx;
+			font-size: 26upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			text-align: center;
+			border-radius: 32upx;
+			margin-left: 15upx;
+			&.cancel{
+				
+				border: 1px solid #DDDDDD;
+				color: #666666;
+			}
+			&.pay{
+				background: #FF233C;
+				color: #FFFFFF;
+			}
+			.contact-btn {
+				top: 0;
+				position: absolute;
+				width:100%;
+				height:100%;
+				opacity: 0;
+			}
+		}
+	}
+</style>

pages_points/integralOrderList.vue

@@ -0,0 +1,440 @@
+<template>
+	<view class="content">
+		<view class="top-fixed">
+			 <u-tabs
+			:current="current"
+			  :scrollable="true"
+			  :list="tabs"  
+			  lineColor="#FF233C"
+			 @change="tabChange">
+			 </u-tabs>
+		</view>
+		<!-- 订单列表 -->
+		<mescroll-body  top="88rpx" bottom="0"  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
+			<view class="order-list">
+				<view  v-for="(item,index) in dataList" :key="index" class="item" >
+					<!-- 订单号，状态 -->
+					<view class="ordersn-box" @click="showDetail(item)">
+						<view class="num">订单号：{{item.orderCode}}</view>
+						<view class="status-box">
+							<text   class="text success" v-if="item.status>1&&item.status<5">
+							{{$getDictLabel2Name(orderStatusOptions,item.status)}}
+							</text>
+							<text   class="text info" v-else>
+							{{$getDictLabel2Name(orderStatusOptions,item.status)}}
+							</text>
+						</view>
+					</view>
+					<view  class="drug-list"  >
+						<view @click="showDetail(item)" v-for="(subItem,subIndex) in item.items" :key="subIndex" class="drug-item" >
+							<view class="img-box">
+								<image :src="subItem.imgUrl==''?'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/drug.svg':subItem.imgUrl" mode="aspectFill"></image>
+							</view>
+							<view class="drug-info"  >
+								<view>
+									<view class="name-box ellipsis2">
+										{{subItem.goodsName}}
+									</view>
+								</view>
+								<view class="num-box">
+									<view class="price">
+										<text class="num" >{{subItem.integral}}</text>
+										<text class="unit">积分</text>
+										<text class="num" v-show="subItem.cash>0">+{{subItem.cash}}</text>
+										<text class="unit" v-show="subItem.cash>0">元</text>
+									</view>
+									<view class="amount"  >x{{subItem.num}}</view>
+								</view>
+							</view>
+						</view>
+						<!-- 实付金额、按钮 -->
+						<view class="bottom-box">
+							<view class="amount-paid">
+								<!-- <text class="label">使用积分：</text> -->
+								<view class="price-box">
+									<view class="num" >{{item.integral}}</view>
+									<view class="unit">积分</view>
+									<view class="unit" v-show="item.payMoney>0">+</view>
+									<view class="num" v-show="item.payMoney>0">{{item.payMoney}}</view>
+									<view class="unit" v-show="item.payMoney>0">元</view>
+								</view>
+							</view>
+							<view class="btn-box">
+								<view class="btn pay" v-if="item.status==4" @click.stop="pay(item)">去支付</view>
+								<view class="btn cancel" v-if="item.status==4" @click.stop="cancelPay(item)">取消订单</view>
+								<!-- <view class="btn cancel">
+									联系客服
+									<button class='contact-btn' open-type="contact">
+									</button>
+								</view> -->
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+ import {getStoreDictByKey} from '@/api/common.js'
+ import {getIntegralOrderList,cannelOrder} from '@/api/integral.js'
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+ 
+ export default {
+	mixins: [MescrollMixin],
+ 	data() {
+ 		return {
+			orderStatusOptions:[],
+			searchKey:"",
+			status:"0",
+			tabs: [
+				{name:"全部",id:"0"},
+				// {name:"待支付",id:"4"},
+				{name:"待发货",id:"1"},
+				{name:"待收货",id:"2"},
+				{name:"已完成",id:"3"},
+				{name:"已取消",id:"5"}
+			],
+			mescroll:null,
+			// 上拉加载的配置
+			upOption: {
+				onScroll:false,
+				use: true, // 是否启用上拉加载; 默认true
+				page: {
+					pae: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+					size: 10 // 每页数据的数量,默认10
+				},
+				noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+				textNoMore:"已经到底了",
+				empty: {
+					icon:'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/hdt/empty_icon.png',
+					tip: '暂无数据'
+				}
+			},
+			// 列表数据
+			dataList: [],
+			current: 0
+ 		}
+ 	},
+	onLoad(option) {
+		this.current = option.current || 0
+		this.status = this.tabs[this.current].id
+		this.getDictByKey("sys_integral_order_status");
+	},
+	onShow() {
+		if(this.mescroll) {
+			this.mescroll.resetUpScroll()
+		}
+	},
+ 	methods: {
+		getDictByKey(key){
+			var data={key:key}
+			getStoreDictByKey(data).then(
+				res => {
+					if(res.code==200){
+						if(key=="sys_integral_order_status"){
+							this.orderStatusOptions=res.data;
+						}
+					}
+				},
+				err => {
+				}
+			);
+			
+		},
+		tabChange(item) {
+			this.status = item.id
+			this.mescroll.resetUpScroll()
+		},
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+		},
+		/*下拉刷新的回调 */
+		downCallback(mescroll) {
+			mescroll.resetUpScroll()
+		},
+		upCallback(page) {
+			//联网加载数据
+			var that = this;
+			var data = {
+				keyword:this.searchKey,
+				status:this.status,
+				pageNum: page.num,
+				pageSize: page.size
+			};
+			getIntegralOrderList(data).then(res => {
+				if(res.code==200){
+					res.data.list = res.data.list.map(v => ({
+					  ...v,
+					  items: [].concat(JSON.parse(v.itemJson || '[]')).filter(Boolean)
+					}));
+					//设置列表数据
+					if (page.num == 1) {
+						that.dataList = res.data.list; 
+						
+					} else {
+						that.dataList = that.dataList.concat(res.data.list);
+						 
+					}
+					that.mescroll.endBySize(res.data.list.length, res.data.total);
+					
+				}else{
+					uni.showToast({
+						icon:'none',
+						title: "请求失败",
+					});
+					that.dataList = null;
+					that.mescroll.endErr();
+				}
+			});
+		},
+		// 查看订单详情
+		showDetail(item) {
+			uni.navigateTo({
+				url: './integralOrderDetails?orderId=' + item.orderId
+			})
+		},
+		pay(item) {
+			 uni.navigateTo({
+			 	url: '/pages_points/integralPayment?orderId='+item.orderId
+			 })
+		},
+		cancelPay(item) {
+			cannelOrder({orderId:item.orderId}).then(res=>{
+				if(res.code ==200) {
+					uni.showToast({
+						title: '取消成功',
+						icon: 'none'
+					})
+					this.mescroll.resetUpScroll()
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				}
+			})
+		}
+ 	}
+ }
+ 
+ 
+</script>
+
+
+<style scoped lang="scss">
+	::v-deep  .u-tabs__wrapper__nav__item{
+		padding: 0 26rpx !important;
+	}
+
+
+.top-fixed{
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 10;
+		height: 88upx;
+		background-color: #fff;
+	}
+	.order-list{
+		padding: 20upx;
+		.item{
+			background: #FFFFFF;
+			border-radius: 16upx;
+			padding: 0 30upx;
+			margin-bottom: 20upx;
+			.ordersn-box{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 34upx 0 20upx;
+				.num{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					line-height: 1;
+				}
+				.status-box{
+					display: flex;
+					align-items: center;
+					.text{
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						line-height: 1;
+						&.success{
+							color: #FF233C;
+						}
+						&.black{
+							color: #111111;
+						}
+						&.info{
+							color: #999999;
+						}
+					}
+				}
+			}
+			.drug-list{
+				.drug-item{
+					padding: 30upx 0;
+					border-bottom: 1px soli #F0F0F0;
+					display: flex;
+					align-items: center;
+					.img-box{
+						width: 160upx;
+						height: 160upx;
+						margin-right: 30upx;
+						flex-shrink: 0;
+						image{
+							width: 100%;
+							height: 100%;
+						}
+					}
+					.drug-info{
+						width: calc(100% - 190upx);
+						height: 160upx;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						.name-box{
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #111111;
+							line-height: 40upx;
+							.tag{
+								display: inline-block;
+								padding: 0 6upx;
+								height: 30upx;
+								background: linear-gradient(90deg, #FF233C 0%, #E2C99E 100%);
+								border-radius: 4upx;
+								margin-right: 10upx;
+								font-size: 22upx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #FFFFFF;
+								line-height: 30upx;
+								float: left;
+								margin-top: 7upx;
+							}
+						}
+						.spec{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+							margin-top: 10upx;
+						}
+						.num-box{
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							.price{
+								display: flex;
+								align-items: flex-end;
+								.unit{
+									font-size: 24upx;
+									font-family: PingFang SC;
+									font-weight: 500;
+									color: #111111;
+									line-height: 1.2;
+									margin-right: 4upx;
+								}
+								.num{
+									font-size: 32upx;
+									font-family: PingFang SC;
+									font-weight: 500;
+									color: #111111;
+									line-height: 1;
+								}
+							}
+							.amount{
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #999999;
+								line-height: 1;
+							}
+						}
+					}
+				}
+				.bottom-box{
+					height: 110upx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.amount-paid{
+						display: flex;
+						align-items: center;
+						.label{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+						}
+						.price-box{
+							display: flex;
+							align-items: flex-end;
+							.unit{
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #FF6633;
+								line-height: 1.2;
+								margin-right: 4upx;
+							}
+							.num{
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: bold;
+								color: #FF6633;
+								line-height: 1;
+							}
+						}
+					}
+					.btn-box{
+						box-sizing: border-box;
+						display: flex;
+						align-items: center;
+						.btn{
+							position: relative;
+							width: 155upx;
+							height: 64upx;
+							line-height: 64upx;
+							font-size: 26upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							text-align: center;
+							border-radius: 32upx;
+							margin-left: 15upx;
+							&:first-child{
+								margin-left: 0;
+							}
+							&.cancel{
+								border: 1px solid #DDDDDD;
+								color: #666666;
+							}
+							&.pay{
+								background: #FF233C;
+								color: #FFFFFF;
+							}
+							.contact-btn {
+								top: 0;
+								position: absolute;
+								width:100%;
+								height:100%;
+								opacity: 0;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages_points/integralOrderPay.vue

@@ -0,0 +1,781 @@
+<template>
+	<view>
+		<view class="inner-box">
+			<!-- 收货人 -->
+			<view class="address-box" v-if="address==null" @click="openAddress()">
+				<view class="left">
+					<view class="name-box">
+						<text class="text name">添加收货地址</text>
+					</view>
+				</view>
+				<view class="arrow-box">
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+			<view class="address-box" v-if="address!=null" @click="openAddress()">
+				<view class="left">
+					<view class="name-box">
+						<text class="text name">{{address.realName}}</text>
+						<text class="text" v-if="address.phone!=null">{{address.phone}}</text>
+					</view>
+					<!-- {{address.address}}  -->
+					<view class="address">
+						{{address.province}}{{address.city}}{{address.district}}{{address.detail}}
+					</view>
+				</view>
+				<view class="arrow-box">
+					<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/arrow_gray.png" mode=""></image>
+				</view>
+			</view>
+			<!-- 药品列表 -->
+			<view class="goods-list">
+				<view class="item">
+					<view class="img-box">
+						<image
+							:src="item.imgUrl==''?'https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/drug.svg':item.imgUrl"
+							mode="aspectFill"></image>
+					</view>
+					<view class="info-box">
+						<view>
+							<view class="name-box ellipsis2">
+								{{item.goodsName}}
+							</view>
+
+						</view>
+						<view class="price-num">
+							<view class="price">
+								<text class="num">{{item.integral}}</text>
+								<text class="unit">积分</text>
+								<text class="num" v-show="item.cash>0">+{{item.cash.toFixed(2)}}</text>
+								<text class="unit" v-show="item.cash>0">元</text>
+							</view>
+							<view class="num">x1</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="other-info">
+				<view class="item">
+					<view class="left">
+						<text class="label">所需积分：</text>
+					</view>
+					<view class="right">
+						<text class="text">{{item.integral}}</text>
+					</view>
+				</view>
+				<view class="item">
+					<view class="left">
+						<text class="label">我的积分：</text>
+					</view>
+					<view class="right">
+						<text class="text">{{integral}}</text>
+					</view>
+				</view>
+				<view class="item" v-if='item.cash>0'>
+					<view class="left">
+						<text class="label">支付金额：</text>
+					</view>
+					<view class="right">
+						<text class="text">{{item.cash.toFixed(2)}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="pay-type" v-if='item.cash>0'>
+				<view class="title">支付方式</view>
+				<radio-group>
+					<view class="item">
+						<view class="left">
+							<image src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/wecha_pay.png" mode="">
+							</image>
+							<text class="text">全款支付</text>
+						</view>
+						<label>
+							<radio :value="1" :checked="payType=='1'" color="#FF233C" />
+						</label>
+					</view>
+				</radio-group>
+			</view>
+			<!-- 备注 -->
+			<!-- <view class="remarks" v-if='item.cash>0&&order!=null'>
+				<input type="text" v-model="order.remark" placeholder="备注留言（选填）" placeholder-class="input" />
+			</view> -->
+		</view>
+
+		<!-- 底部按钮 -->
+		<view class="btn-box">
+			<view class="btn" v-if="item!=null" @click="payOrder()">{{item.cash>0?'立即支付':'立即兑换'}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getAddressList} from '@/api/address'
+	import {
+		getIntegralGoodsById,
+		createOrder
+	} from '@/api/integral.js'
+	import {
+		getUserInfo
+	} from '@/api/user'
+	export default {
+		data() {
+			return {
+				addressId: null,
+				address: null,
+				orderId: null,
+				order: null,
+				item: {
+					cash: null,
+				},
+				integral: 0,
+				payTypes: [],
+				payType: '1',
+			}
+		},
+		onLoad(option) {
+			this.getAddressList()
+			this.goodsId = option.goodsId;
+			var that = this;
+			uni.$on('updateAddress', (e) => {
+				console.log("选择地址", e)
+				that.addressId = e.addressId;
+				that.address = e;
+				// that.address.address=e.province+e.city+e.district+e.detail
+			})
+			this.getIntegralGoodsById();
+			this.getUserInfo();
+		},
+		methods: {
+			getAddressList(){
+				uni.showLoading({
+					title:"正在加载中"
+				})
+				getAddressList().then(
+					res => {
+						uni.hideLoading()
+						if(res.code==200){
+							const defaultAddress = res.data.find(item => item.isDefault == 1);
+							        
+							        if(defaultAddress){
+							          this.address = defaultAddress;
+									  this.addressId=defaultAddress.addressId
+							          console.log('找到默认地址:', defaultAddress);
+							        } else {
+							          // 如果没有找到默认地址，可以选择第一个地址或者设为null
+							          // this.address = res.data.length > 0 ? res.data[0] : null;
+							          console.log('未找到默认地址，使用第一个地址或设为null');
+							        }
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: "请求失败",
+							});
+						}
+					},
+					rej => {}
+				);
+			},
+			getUserInfo() {
+				getUserInfo().then(
+					res => {
+						if (res.code == 200) {
+							if (res.user != null) {
+								this.integral = res.user.integral;
+							}
+						}
+					},
+					rej => {}
+				);
+			},
+			getIntegralGoodsById() {
+				var data = {
+					goodsId: this.goodsId
+				};
+				console.log(data)
+				getIntegralGoodsById(data).then(
+					res => {
+						if (res.code == 200) {
+							this.item = res.data;
+
+						} else {
+
+						}
+					},
+					rej => {}
+				);
+			},
+			openAddress() {
+				uni.navigateTo({
+					url: '/pages_user/user/address'
+				})
+			},
+			payOrder() {
+				if (this.addressId == null) {
+					uni.showToast({
+						icon: 'none',
+						title: "请选择收货地址",
+					});
+					return;
+
+				}
+				var data = {
+					goodsId: this.goodsId,
+					addressId: this.addressId,
+				};
+				var that = this;
+				uni.showLoading();
+				createOrder(data).then(
+					res => {
+						if (res.code == 200) {
+							var temps = ['wqKEklE_w5N19w9VAGY74TltPE6Ne3BaFObDD47uDEo']
+							uni.requestSubscribeMessage({
+								tmplIds: temps,
+								success(e) {
+									setTimeout(function() {
+										if (that.item.cash > 0) {
+											uni.redirectTo({
+												url: "./integralPayment?orderId=" + res.order
+													.orderId
+											})
+										} else {
+											uni.redirectTo({
+												url: "./integralOrderPaySuccess?orderId=" + res
+													.order.orderId
+											})
+										}
+									}, 200);
+								},
+								fail(e) {
+									setTimeout(function() {
+										if (that.item.cash > 0) {
+											uni.redirectTo({
+												url: "./integralPayment?orderId=" + res.order
+													.orderId
+											})
+										} else {
+											uni.redirectTo({
+												url: "./integralOrderPaySuccess?orderId=" + res
+													.order.orderId
+											})
+										}
+									}, 200);
+								}
+							})
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.inner-box {
+		padding: 20upx 20upx 140upx;
+
+		.address-box {
+			box-sizing: border-box;
+			min-height: 171upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			background-image: url(https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/address_bg.png);
+			background-repeat: no-repeat;
+			background-size: 100% 30upx;
+			background-position: left bottom;
+			padding: 38upx 30upx 36upx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.left {
+				width: 92%;
+
+				.name-box {
+					display: flex;
+					align-items: center;
+
+					.text {
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #111111;
+						line-height: 1;
+
+						&.name {
+							margin-right: 30upx;
+						}
+					}
+				}
+
+				.address {
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 42upx;
+					text-align: left;
+					margin-top: 23upx;
+				}
+			}
+
+			.arrow-box {
+				width: 12upx;
+				height: 23upx;
+				display: flex;
+				align-items: cenetr;
+				justify-content: cenetr;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.goods-list {
+			margin-top: 20upx;
+			padding: 0 30upx;
+			background-color: #FFFFFF;
+			border-radius: 16upx;
+
+			.item {
+				padding: 30upx 0;
+				border-bottom: 1px solid #EDEEEF;
+				display: flex;
+				align-items: center;
+
+				.img-box {
+					width: 160upx;
+					height: 160upx;
+					margin-right: 30upx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.info-box {
+					width: calc(100% - 190upx);
+					height: 160upx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.name-box {
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #111111;
+						line-height: 40upx;
+
+						.tag {
+							display: inline-block;
+							padding: 0 6upx;
+							height: 30upx;
+							background: linear-gradient(90deg, #FF233C 0%, #E2C99E 100%);
+							border-radius: 4upx;
+							margin-right: 10upx;
+							font-size: 22upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FFFFFF;
+							line-height: 30upx;
+							float: left;
+							margin-top: 7upx;
+						}
+					}
+
+					.spec {
+						margin-top: 10upx;
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						line-height: 1;
+					}
+
+					.price-num {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.price {
+							display: flex;
+							align-items: flex-end;
+
+							.unit {
+								font-size: 24upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								line-height: 1.2;
+								margin-right: 4upx;
+							}
+
+							.num {
+								font-size: 32upx;
+								font-family: PingFang SC;
+								font-weight: 500;
+								color: #111111;
+								line-height: 1;
+							}
+						}
+
+						.num {
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+						}
+					}
+				}
+			}
+
+			.sub-total {
+				height: 88upx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+
+				.label {
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+
+				.price {
+					display: flex;
+					align-items: flex-end;
+
+					.unit {
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FF6633;
+						line-height: 1.2;
+						margin-right: 4upx;
+					}
+
+					.num {
+						font-size: 32upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #FF6633;
+						line-height: 1;
+					}
+				}
+			}
+		}
+
+		.other-info {
+			margin-top: 20upx;
+			background-color: #fff;
+			border-radius: 20upx;
+			overflow: hidden;
+			padding: 0 30upx;
+
+			.title {
+				height: 80upx;
+				line-height: 80upx;
+				font-size: 30upx;
+				color: #000;
+				font-weight: bold;
+				border-bottom: 2upx solid #eeeeee;
+			}
+
+			.item {
+				height: 80upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				&:last-child {
+					border-bottom: none;
+				}
+
+				.left {
+					flex: 1;
+					display: flex;
+					align-items: center;
+
+					.label {
+						min-width: 140rpx;
+						font-size: 28upx;
+						color: #000;
+					}
+
+					.text {
+						font-size: 28upx;
+						color: #1b1b1b;
+					}
+				}
+
+				.right {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+
+					.text {
+						font-size: 28upx;
+						color: #1b1b1b;
+					}
+
+					.ic-close {
+						margin-left: 10rpx;
+						width: 30rpx;
+						height: 30rpx;
+					}
+
+					.ic-back {
+						margin-left: 10rpx;
+						width: 15rpx;
+						height: 30rpx;
+					}
+				}
+
+				.item-btn {
+					max-width: 200rpx;
+					padding: 0rpx 15rpx;
+					height: 48upx;
+					border-radius: 24upx;
+					line-height: 48upx;
+					font-size: 24upx;
+					color: #000;
+					border: 1upx solid #d8d8d8;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+			}
+		}
+
+		.remarks {
+			height: 88upx;
+			padding: 0 30upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			margin-top: 20upx;
+			display: flex;
+			align-items: center;
+
+			input {
+				width: 100%;
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+
+			.input {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+	}
+
+
+	.btn-box {
+		height: 140upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0rpx 30upx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.btn {
+			width: 100%;
+			height: 88upx;
+			line-height: 88upx;
+			text-align: center;
+			font-size: 34upx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+			background: #FF233C;
+			border-radius: 10upx;
+		}
+	}
+
+	.pay-type {
+		box-sizing: border-box;
+		height: 192upx;
+		background: #FFFFFF;
+		border-radius: 16upx;
+		margin-top: 20upx;
+		padding: 40upx 30upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+
+		.title {
+			font-size: 28upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			line-height: 1;
+		}
+
+		.item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.left {
+				display: flex;
+				align-items: center;
+
+				image {
+					width: 44upx;
+					height: 44upx;
+					margin-right: 20upx;
+				}
+
+				.text {
+					font-size: 30upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #222222;
+					line-height: 1;
+				}
+			}
+		}
+	}
+
+	.coupon {
+		height: 100%;
+
+		.empty {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 650rpx;
+			width: 100%;
+
+			image {
+				width: 280rpx;
+				height: 200rpx;
+			}
+		}
+	}
+
+	.coupon-box {
+		overflow-y: auto;
+		padding: 80rpx 20rpx 80rpx;
+		height: 650rpx;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: flex-start;
+		box-sizing: border-box;
+
+		.coupon-item {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			margin-bottom: 16rpx;
+			height: 170rpx;
+
+			&:last-child {
+				margin-bottom: 0rpx;
+			}
+
+			.left {
+				color: #fff;
+				font-size: 36rpx;
+				font-weight: bold;
+				text-align: center;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				position: relative;
+				width: 230rpx;
+
+				image {
+					position: absolute;
+					width: 230rpx;
+					height: 170rpx;
+					color: #fff;
+				}
+
+				.num {
+					font-size: 40rpx;
+				}
+
+				.pic-num {
+					font-size: 20rpx;
+					z-index: 99;
+				}
+			}
+
+			.right {
+
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: flex-start;
+				height: 170rpx;
+				width: calc(100% - 230rpx);
+				padding: 0 17rpx 0 24rpx;
+				background-color: #fff;
+				box-sizing: border-box;
+
+				.title {
+					width: 100%;
+					font-size: 0.3 * 100rpx;
+					color: #282828;
+					height: 0.93 * 100rpx;
+					line-height: 0.93 * 100rpx;
+					border-bottom: 1px solid #f0f0f0;
+				}
+
+				.btns {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					width: 100%;
+					font-size: 0.2 * 100rpx;
+					color: #999;
+					height: 0.76 * 100rpx;
+
+					.btn {
+						width: 1.36 * 100rpx;
+						height: 0.44 * 100rpx;
+						border-radius: 0.22 * 100rpx;
+						font-size: 0.22 * 100rpx;
+						color: #fff;
+						text-align: center;
+						line-height: 0.44 * 100rpx;
+						background-color: #FF233C;
+
+						.gray {
+							background-color: #ccc;
+						}
+					}
+
+				}
+			}
+		}
+
+	}
+</style>

pages_points/integralOrderPaySuccess.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="content">
+		<view class="inner">
+			<view class="top">
+				<text class="title">兑换成功</text>
+				 <image class="icon" src="https://hdtobs.obs.cn-north-4.myhuaweicloud.com/miniapp/success.png" ></image>
+				 <view   class="btn-box">
+				 	<view class="btn cancel" @click="showOrderDetails(order.orderId)"> 查看订单</view>
+				 </view>
+			</view>
+			<!-- 订单详情查看 -->
+			<view class="order-info">
+				<view class="title">订单信息</view>
+				<view class="item">
+					<text class="label">订单编号</text>
+					<view class="sn-box">
+						<text class="text">{{order.orderCode}}</text>
+						<view class="copy-btn" @click="copyTest(order.orderCode)">复制</view>
+					</view>
+				</view>
+				<view class="item">
+					<text class="label">支付金额</text>
+					<text class="text">{{order.integral}}</text>
+				</view>
+				<view class="item">
+					<text class="label">兑换时间</text>
+					<text class="text">{{formattedCreateTime}}</text>
+				</view>
+				 
+			</view>
+			
+		</view>
+		 
+	</view>
+</template>
+
+<script>
+	import {getIntegralOrderById} from '@/api/integral.js'
+	export default {
+		data() {
+			return {
+				order:null,
+			}
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+			　　title:'支付结果'
+			})
+			uni.$emit('refreshStoreOrder');
+			this.orderId=option.orderId; 
+			this.getIntegralOrderById();
+		},
+		computed:{
+		formattedCreateTime() {
+			if (!this.order || !this.order.createTime) return '';
+			
+			// 如果是时间戳格式
+			if (typeof this.order.createTime === 'number') {
+				const date = new Date(this.order.createTime);
+				return this.formatDate(date);
+			}
+			
+			// 如果是字符串格式，尝试解析
+			const date = new Date(this.order.createTime);
+			if (!isNaN(date.getTime())) {
+				return this.formatDate(date);
+			}
+			
+			// 如果无法解析，返回原值
+			return this.order.createTime;
+		},	
+		},
+		methods: {
+			// 日期格式化方法
+			formatDate(date) {
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+				const seconds = String(date.getSeconds()).padStart(2, '0');
+				
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
+			
+			getIntegralOrderById(){
+				var data = {orderId:this.orderId};
+				var that=this;
+				uni.showLoading();
+				getIntegralOrderById(data).then(
+					res => {
+						uni.hideLoading();
+						if(res.code==200){
+							that.order=res.data;
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+				
+			},
+			copyTest(text) {
+				// 复制方法
+				uni.setClipboardData({
+					data:text,
+					success:()=>{
+						uni.showToast({
+							title:'内容已成功复制到剪切板',
+							icon:'none'
+						})
+					}
+				});
+			},
+			showOrderDetails(orderId){
+				console.log(orderId)
+				uni.redirectTo({
+					url: "./integralOrderDetails?orderId="+orderId
+				}) 
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: 100%;
+	}
+	.content{
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		.inner{
+			padding: 20upx;
+			.top{
+				box-sizing: border-box;
+				background: #FFFFFF;
+				border-radius: 16upx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				padding: 50upx 0upx;
+				.title{
+					font-size: 40upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #222222;
+					line-height: 1;
+					text-align: center;
+				}
+				.icon{
+					margin: 60upx 0upx;
+					width: 100upx;
+					height: 100upx;
+				}
+				 
+			}
+			 
+			.order-info{
+				margin-top: 20upx;
+				background: #FFFFFF;
+				border-radius: 16upx;
+				padding: 40upx 30upx;
+				.title{
+					font-size: 30upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #222222;
+					line-height: 1;
+				}
+				.item{
+					margin-top: 40upx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.label{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+						line-height: 1;
+					}
+					.text{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #222222;
+						line-height: 32upx;
+					}
+					.cont-text{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+						.bold{
+							color: #111111;
+						}
+					}
+					.sn-box{
+						display: flex;
+						align-items: center;
+						.copy-btn{
+							width: 58upx;
+							height: 32upx;
+							line-height: 32upx;
+							text-align: center;
+							font-size: 22upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #222222;
+							background: #F5F5F5;
+							border-radius: 4upx;
+							margin-left: 24upx;
+						}
+					}
+					 
+				}
+				.line{
+					width: 100%;
+					height: 1px;
+					background: #F0F0F0;
+					margin-top: 30upx;
+				}
+			}
+		}
+		.btn-box{
+			margin-top: 20upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			.btn{
+				width: 155upx;
+				height: 64upx;
+				line-height: 64upx;
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-align: center;
+				border-radius: 32upx;
+				&.cancel{
+					border: 1px solid #DDDDDD;
+					color: #666666;
+				}
+				 
+			}
+		}
+	}
+	
+</style>

pages_points/integralPayment.vue

@@ -0,0 +1,392 @@
+<template>
+	<view>
+		<view class="inner-box" v-if="order!=null">
+			<!-- 时间、价格 -->
+			<view class="time-price">
+				<text class="time">订单金额</text>
+				<view class="price-box">
+					<text class="unit">¥</text>
+					<text class="num">{{order.payMoney.toFixed(2)}}</text>
+				</view>
+			</view>
+			<!-- 订单详情查看 -->
+			<view class="order-info">
+				<view class="title">订单信息</view>
+				<view class="item">
+					<text class="label">订单编号</text>
+					<view class="sn-box">
+						<text class="text">{{order.orderCode}}</text>
+						<view class="copy-btn" @click="copyTest(order.orderCode)">复制</view>
+					</view>
+				</view>
+				<view class="item">
+					<text class="label">下单时间</text>
+					<text class="text">{{order.createTime}}</text>
+				</view>
+				<view class="item">
+					<text class="label">使用积分</text>
+					<text class="text">{{order.integral}}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="btn-box">
+			<view class="btn" v-if="order!=null" @click="payOrder()">立即支付</view>
+			<!-- <view class="btn1" v-if="order!=null"    >
+				亲友代付
+				<button class='share-btn' data-name="shareBtn" open-type="share">
+				</button>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getIntegralOrderById,payment} from '@/api/integral.js'
+	export default {
+		data() {
+			return {
+				payMethod:null,
+				orderId:null,
+				order:null,
+				
+			}
+		},
+		onLoad(option) {
+			this.orderId=option.orderId;
+			this.payMethod=option.payMethod;
+			if(this.payMethod=='app') {
+				this.getIntegralById();
+			}
+		},
+		onShow() {
+			if(this.payMethod!='app') {
+				//防止app进来的拉起的支付，关闭支付页重复调用
+				this.getIntegralById();
+			}
+		},
+		methods: {
+			copyTest(text) {
+				// 复制方法
+				uni.setClipboardData({
+					data:text,
+					success:()=>{
+						uni.showToast({
+							title:'内容已成功复制到剪切板',
+							icon:'none'
+						})
+					}
+				});
+			},
+			getIntegralById(){
+				var data={orderId:this.orderId};
+				console.log(data)
+				getIntegralOrderById(data).then(
+					res => {
+						if(res.code==200){
+							this.order=res.data
+							if(this.payMethod!=null&&this.payMethod=='app'){
+								this.payOrder();
+							}
+						}else{
+							 
+						}
+					},
+					rej => {}
+				);
+			},
+			payOrder(){
+				var data = {
+					orderId:this.orderId,
+					appId: wx.getAccountInfoSync().miniProgram.appId
+				};
+				console.log('当前小程序信息id',data)
+				var that=this;
+				uni.showLoading();
+				payment(data).then(
+					res => {
+						if(res.code==200){
+							if(res.isPay==0){
+								if(res.type=="tz"){
+									uni.setStorageSync("ztPayUrl",res.data.body.url)
+									uni.navigateTo({
+										url:"/pages_order/tzPay"
+									})
+								}
+								if(res.type=="yb"){
+									var payData=JSON.parse(res.data.pay_info)
+									console.log(payData)
+									uni.requestPayment({
+									 	provider: 'wxpay',
+									 	timeStamp: payData.timeStamp,
+									 	nonceStr: payData.nonceStr,
+									 	package: payData.package,
+									 	signType: payData.signType,
+									 	paySign: payData.paySign,
+									 	success: function(res) {
+											console.log(that.order.orderId)
+									 		 uni.hideLoading();
+											 uni.redirectTo({
+											 	url:"./integralOrderPaySuccess?orderId="+that.order.orderId
+											 }) 
+											 
+									 	},
+									 	fail: function(err) {
+											uni.showToast({
+												icon:'none',
+												title:'fail:' + JSON.stringify(err),
+											});
+									 		uni.hideLoading();
+											
+									 	}
+									});
+									
+								}
+								else if(res.type=="hf"){
+									var payData=JSON.parse(res.data.pay_info)
+									console.log(payData)
+									uni.requestPayment({
+									 	provider: 'wxpay',
+									 	timeStamp: payData.timeStamp,
+									 	nonceStr: payData.nonceStr,
+									 	package: payData.package,
+									 	signType: payData.signType,
+									 	paySign: payData.paySign,
+									 	success: function(res) {
+											console.log(that.order.orderId)
+									 		 uni.hideLoading();
+											 uni.redirectTo({
+											 	url:"./integralOrderPaySuccess?orderId="+that.order.orderId
+											 }) 
+											 
+									 	},
+									 	fail: function(err) {
+											uni.showToast({
+												icon:'none',
+												title:'fail:' + JSON.stringify(err),
+											});
+									 		uni.hideLoading();
+											
+									 	}
+									});
+									
+								}
+								else if(res.type=="wx"){
+									uni.requestPayment({
+									 	provider: 'wxpay',
+									 	timeStamp: res.data.timeStamp,
+									 	nonceStr: res.data.nonceStr,
+									 	package: res.data.packageValue,
+									 	signType: res.data.signType,
+									 	paySign: res.data.paySign,
+									 	success: function(res) {
+											console.log(that.order.orderId)
+									 		 uni.hideLoading();
+											 uni.redirectTo({
+											 	url:"./integralOrderPaySuccess?orderId="+that.order.orderId
+											 }) 
+											 
+									 	},
+									 	fail: function(err) {
+											uni.showToast({
+												icon:'none',
+												title:'fail:' + JSON.stringify(err),
+											});
+									 		uni.hideLoading();
+											
+									 	}
+									});
+									
+								}
+							}
+							else{
+								uni.hideLoading();
+								uni.redirectTo({
+									url:"./integralOrderPaySuccess?orderId="+that.order.orderId
+								}) 
+							}
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					},
+					rej => {}
+				);
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.inner-box{
+		padding: 20upx 20upx 300upx;
+		.time-price{
+			box-sizing: border-box;
+			padding: 50upx 0upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			.time{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #222222;
+				line-height: 1;
+				text-align: center;
+			}
+			.desc{
+				margin: 30upx 0upx 15upx;
+				font-size: 26upx;
+				font-family: PingFang SC;
+				color: #999999;
+				line-height: 1;
+				text-align: center;
+			}
+			.price-box{
+				display: flex;
+				align-items: flex-end;
+				margin-top: 28upx;
+				.unit{
+					font-size: 32upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF6633;
+					line-height: 1.3;
+					margin-right: 10upx;
+				}
+				.num{
+					font-size: 56upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FF6633;
+					line-height: 1;
+				}
+			}
+		}
+		.order-info{
+			margin-top: 20upx;
+			background: #FFFFFF;
+			border-radius: 16upx;
+			padding: 40upx 30upx;
+			.title{
+				font-size: 30upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #222222;
+				line-height: 1;
+			}
+			.item{
+				margin-top: 40upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.label{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 1;
+				}
+				.text{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #222222;
+					line-height: 32upx;
+				}
+				.cont-text{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					.bold{
+						color: #111111;
+					}
+				}
+				.sn-box{
+					display: flex;
+					align-items: center;
+					.copy-btn{
+						width: 58upx;
+						height: 32upx;
+						line-height: 32upx;
+						text-align: center;
+						font-size: 22upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #222222;
+						background: #F5F5F5;
+						border-radius: 4upx;
+						margin-left: 24upx;
+					}
+				}
+				 
+			}
+			.line{
+				width: 100%;
+				height: 1px;
+				background: #F0F0F0;
+				margin-top: 30upx;
+			}
+		}
+	}
+	
+	
+	.btn-box{
+	 	z-index: 9999;
+	 	width: 100%;
+	 	padding: 30rpx 30upx 0rpx;
+	 	position: fixed;
+	 	bottom: 0;
+	 	left: 0;
+	 	box-sizing: border-box;
+	 	background-color: #ffffff;
+	 	display: flex;
+		flex-direction: column;
+	 	align-items: center;
+	 	justify-content: center;
+	 	.btn{
+			margin-bottom: 20rpx;
+	 		width: 100%;
+	 		height: 88upx;
+	 		line-height: 88upx;
+	 		text-align: center;
+	 		font-size: 34upx;
+	 		font-family: PingFang SC;
+	 		font-weight: 400;
+	 		color: #FFFFFF;
+	 		background: #FF233C;
+	 		border-radius: 10upx;
+			position: relative;
+	 	}
+		.btn1{
+			margin-bottom: 20rpx;
+			width: 100%;
+			height: 88upx;
+			line-height: 88upx;
+			text-align: center;
+			font-size: 34upx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #FF233C;
+			border: 1rpx solid #FF233C;
+			border-radius: 10upx;
+			position: relative;
+			.share-btn {
+				top:0rpx;
+				left:0rpx;
+				position: absolute;
+				width: 100%;
+				height: 88upx;
+				display: flex;
+				opacity: 0;
+			}
+		}
+	}
+	 
+</style>

utils/common.js

@@ -127,6 +127,21 @@ export function isLogin() {
 	return !!obj;
 }
 
+export function getDictLabel2Name(dicts,dictValue) {
+	if(dictValue==null){
+		return "";
+	}
+	 
+	var name="";
+	dicts.forEach(function(item, index, array) {
+		 if(dictValue.toString()==item.dictValue.toString())
+		 {
+			 name=item.dictLabel
+		 }
+	});
+	return name;
+}
+
 
 
 export function logout() {