暂存代码

api/common.js

@@ -63,3 +63,40 @@ export function checkAppVersion(data) {
 	    data,
 	});
 }
+
+
+/**
+ * 查询分享海报
+ * @param {Object} data
+ */
+export function getSharePoster(data) {
+	return request({
+	    url: "/common/getSharePoster",
+	    method: "get",
+	    data,
+	});
+}
+
+/**
+ * 生成分享海报
+ * @param {Object} data
+ */
+export function generateSharePoster(data) {
+	return request({
+	    url: "/common/generateSharePoster",
+	    method: "get",
+	    data,
+	});
+}
+
+/**
+ * 查询APP轮播图
+ * @param {Object} data
+ */
+export function getCarouselImage(data) {
+	return request({
+	    url: "/common/getCarouselImage",
+	    method: "get",
+	    data,
+	});
+}

api/news.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request.js'; // 引入封装的方法
+
+/**
+ * 查询资讯列表
+ * @param {Object} params
+ */
+export function getNewsList(params) {
+	return request({
+	    url: "/fbusininfo/getList",
+	    method: "get",
+	    data:params,
+	});
+}
+
+/**
+ * 查询资讯详情
+ * @param {Object} params
+ */
+export function getNewsDetail(params) {
+	return request({
+	    url: "/fbusininfo/getDetail",
+	    method: "get",
+	    data:params,
+	});
+}

common.scss

@@ -474,10 +474,10 @@
 .way_item{
 	display: flex;
 	justify-content: space-between;
-	line-height: 82rpx;
+	// line-height: 82rpx;
 	.way_item_{
-		display: flex;
+		// display: flex;
-		align-items: center;
+		// align-items: center;
 	}
 	.way_item_val{
 		font-weight: bold;
@@ -486,6 +486,19 @@
 		margin-left: 20rpx;
 	}
 }
+.balance_comm_msg{
+	margin-left: 20rpx;
+	color: red;
+	font-size: 18rpx;
+	margin-top: 6rpx;
+}
+.go_balance_comm_warp{
+	border:1rpx solid $app-bt-bj;
+	color: $app-bt-bj;
+	padding: 10rpx 14rpx;
+	font-size: 16rpx;
+	border-radius: 10rpx;
+}
 .popup_but{
 	position: fixed;
 	bottom: 64rpx;

components/choiceness/choiceness.vue

@@ -14,7 +14,7 @@
 						<text>￥</text>
 						<text style="color:36rpx;">{{item.adPrice}}</text>
 					</view>
-					<!-- <view class="price_sell">已售{{item.sell}}件</view> -->
+					<view class="price_sell">已售{{item.sales}}件</view>
 				</view>
 			</view>
 		</view>
@@ -58,7 +58,7 @@
 
 <style lang="scss" scoped>
 	.choiceness_warp{
-		margin-top: 100rpx;
+		margin-top: 50rpx;
 	}
 	.choiceness_title{
 		display: flex;

components/header.vue

@@ -2,7 +2,7 @@
 	<!-- 导航栏 -->
 	<view class="header_" >
 		<view style="margin-top: 20rpx;" @click="leftJump">
-			<up-image src="/static/common/left.png" width="18" height="20" bgColor="#f1f6ff00" @click="jumpMine"/>
+			<up-image src="/static/common/left.png" width="18" height="20" bgColor="#f1f6ff00"/>
 		</view>
 		<view class="title_">{{leftTitle}}</view>
 		<view @click="rightJump">{{rightTitle}}</view>

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__DA4D660",
     "description" : "德商汇优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 106,
+    "versionCode" : 109,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -390,6 +390,27 @@
 			{
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/news/news",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/news_info/news_info",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/pointsRedemption/pointsRedemption",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	],
 	"tabBar": {

pages/home/home.vue

@@ -79,11 +79,11 @@
 				<!-- 积分兑换，红包抽奖 -->
 				<view class="min_card_warp">
 					<!-- 积分兑换 -->
-					<view class="min_card_item min_card_item_jf" @click="jumpPrdference">
+					<view class="min_card_item min_card_item_jf" @click="jumpIntegral">
 						<up-image src="/static/home/min_card_jfdh.png" width="60" height="14" bgColor="#f1f6ff00" ></up-image>
 						<view class="min_card_item_content">
 							<view class="content_msg">
-								<view>好礼随心兑</view>
+								<view>好物随心兑</view>
 								<view style="display: flex;align-items: center;">
 									兑换
 									<view style="margin-top: 6rpx;margin-left: 4rpx;"><up-image src="/static/common/right_y.png" width="10" height="10" bgColor="#f1f6ff00"></up-image></view>
@@ -111,7 +111,7 @@
 				<view class="product_comm yx_warp" v-if="yxProduct && yxProduct.length!==0" @click="jumpPrdference">
 					<view class="product_title">
 						<view class="product_title_left">
-							<text class="product_title_z">德商汇优选</text>
+							<text class="product_title_z">平价专区</text>
 							<text class="product_title_zk">4折起 ></text>
 						</view>
 						<view class="product_title_f" style="font-weight: bold; color: #999999FF;">
@@ -182,8 +182,8 @@
 <script>
 	import choiceness from '@/components/choiceness/choiceness.vue';
 	import { searchList } from '@/api/product.js';
-	import { getCascadeCategory,checkAppVersion } from '@/api/common.js';
+	import { getCascadeCategory,checkAppVersion,getCarouselImage } from '@/api/common.js';
-	import { SEARCH_TYPE } from '@/utils/enumUtils.js'
+	import { SEARCH_TYPE,APP_PAGE_TYPE } from '@/utils/enumUtils.js'
 	import CustomTabBar from '@/components/custom-tab-bar.vue'; // 引入自定义组件路径可能需要根据项目结构调整
 	import dayjs from 'dayjs';
 	import { comparisonVersionHandler } from '@/utils/index.js';
@@ -193,8 +193,8 @@
 		data() {
 			return {
 				swiperList:[
-					'/static/home/banner01.png',  
+					// '/static/home/banner01.png',  
-					'/static/home/banner04.png',  
+					// '/static/home/banner04.png',  
 				],
 				currentNum:0,
 				sortList:[],
@@ -260,16 +260,16 @@
 				const time2 = dayjs();
 				const diff = time2.diff(time1);
 				if(!versionUpdateTime || diff > 5 * 60 * 1000){
-					console.log("进来了...");
 					this.platformType = appUpdate == 'android' ? 'ANDROID' : 'IOS';
 					this.checkUpdate();  // 判断是否需要更新
 				}else{
-					console.log("没有大于");
+					console.log("不需要更新...");
 				}
 			// #endif 
 			this.getSortList();
 			this.querySearchList(SEARCH_TYPE.SOMETHING);// 好物专区
 			this.querySearchList(SEARCH_TYPE.EXPLOSIVE);// 爆单专区
+			this.getCarouselImage();
 		},
 		mounted() {
 		},
@@ -366,6 +366,23 @@
 					plus.runtime.openURL(updateApkObj.downloadUrl);
 				}
 			},
+			
+			// 查询轮播图
+			async getCarouselImage(){
+				const params={
+					pageUi:APP_PAGE_TYPE.HOME,
+				}
+				const resp = await getCarouselImage(params);
+				if(resp && resp.bizcode === 100){
+					const data = resp.data || [];
+					this.swiperList = data.length !== 0 ? data.map(obj=>obj.carouselImage) : [];
+				}
+			},
+			jumpIntegral(){
+				uni.navigateTo({
+					url:'/pages/pointsRedemption/pointsRedemption',
+				})
+			},
 			jumpTurntable(){
 				uni.navigateTo({
 					url:'/pages/turntable/turntable?backPath=home',

pages/invite_friends/invite_friends.vue

@@ -1,18 +1,7 @@
 <template>
 	<view class="invite_friends_warp">
-		<!-- <view class="invite_img">
-			<view class="invite_content_img">
-				<view>
-					<view class="invite_content_img_title">邀请你</view>
-					<view class="invite_content_img_msg">扫一扫，好物轻松购</view>
-				</view>
-				<view>
-					<up-image src="/static/invite/bg.png" width="60" height="60" bgColor="#f1f6ff00"></up-image>
-				</view>
-			</view>
-		</view> -->
 		<view class="invite_img">
-			<up-image src="/static/invite/bg.png" width="100%" height="460" bgColor="#f1f6ff00" shape="square" radius=10></up-image>
+			<up-image :loading="imageLoading" :src="inviteImage" width="100%" height="460" bgColor="#f1f6ff00" shape="square" radius=10></up-image>
 		</view>
 		<view class="invite_but">
 			<view class="save_but">
@@ -24,29 +13,39 @@
 </template>
 
 <script>
-	import { base64 } from '@/utils/inviteBase64.js';
+	import { getSharePoster,generateSharePoster } from '@/api/common.js';
+	
 	export default {
 		data() {
 			return {
-				
+				inviteImage:null,
+				imageLoading:false,
 			}
 		},
+		mounted() {
+			this.getSharePoster();
+		},
 		methods: {
-			// 保存图片
+			
-			// async saveImage(){
+			// 查询分享模版
-			// 	const shareImagesObj = this.shareImagesArr[this.shareImagesIndex];
+			async getSharePoster(){
-			// 	const params = {
+				this.imageLoading = true;
-			// 		id:this.shareId,
+				const resp = await getSharePoster();
-			// 		imgId:shareImagesObj.id,
+				if(resp && resp.bizcode === 100){
-			// 	}
+					const data = resp.data[0];
-			// 	const response = await uni.$httpHeader.post(mergeImage,params);
+					// 生成分享图
-			// 	this.saveHeadImgFile(response.data);
+					const generateResp = await generateSharePoster({id:data.id});
-			// },
+					if(generateResp && generateResp.bizcode === 100){
+						this.inviteImage = generateResp.data;
+					}
+				}
+				this.imageLoading = false;
+			},
 			saveBaseImgFile() {  
 				uni.showLoading({
 				  title: '保存中...',
 				})
-				const currentBase64 = base64;
+				const currentBase64 = this.inviteImage;
 			    const bitmap = new plus.nativeObj.Bitmap('base64')  
 			    bitmap.loadBase64Data(currentBase64, () => {  
 			            const url = '_doc/' + new Date().getTime() + '.png'  
@@ -54,7 +53,6 @@
 			                url,  
 			                {  
 			                    overwrite: false, // 是否覆盖 
-			                    // quality: 'quality'  // 图片清晰度  
 			                },  
 			                (i) => {  
 			                    uni.saveImageToPhotosAlbum({  
@@ -91,8 +89,6 @@
 			        }  
 			    )  
 			}  
-
-
 		}
 	}
 </script>

pages/merchant_settlement/merchant_settlement.vue

@@ -13,7 +13,7 @@
 			    placeholder="请输入店铺名称"
 			    clearable
 				border="none"
-				v-model="form.name"
+				v-model="form.storeName"
 			></up-input>
 		</view>
 		<view class="card_comm card_hang_comm">
@@ -80,6 +80,7 @@
 		<view class="add_but" @click="addFun">
 			提交
 		</view>
+		<up-toast ref="uToastRef"></up-toast>
 	</view>
 </template>
 
@@ -91,7 +92,7 @@
 		data() {
 			return {
 				form:{
-					name:'',// 店铺名称
+					storeName:'',// 店铺名称
 					address:"",// 店铺地址
 					name:null,
 					mobile:null,
@@ -159,7 +160,53 @@
 		methods: {
 			// 确认提交
 			addFun(){
-				console.log("确认提交....");
+				const params = {
+					...this.form,
+				}
+				if(!params.storeName){
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "请输入店铺名称",
+					});
+					return;
+				}
+				if(!params.address){
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "请输入店铺地址",
+					});
+					return;
+				}
+				if(!params.name){
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "请输入真实姓名",
+					});
+					return;
+				}
+				if(!params.mobile){
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "请输入手机号码",
+					});
+					return;
+				}
+				if(!params.number){
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "请输入证件号码",
+					});
+					return;
+				}
+				this.$refs.uToastRef.show({
+					type: 'success',
+					message: "提交成功",
+				});
+				setTimeout(()=>{
+					uni.switchTab({
+						url: '/pages/mine/mine',
+					});
+				},1000)
 			}
 		}
 	}

pages/mine/mine.vue

@@ -108,10 +108,10 @@
 				<view class="content_">
 					<view class="content_1">企业入驻</view>
 					<view class="content_2">请联系负责人</view>
-					<view class="content_3">15888880123</view>
+					<view class="content_3">139 2278 6999</view>
 				</view>
 				<view class="but_">
-					<view class="but_copy" @click="copyMobile('15888880123')">复制号码</view>
+					<view class="but_copy" @click="copyMobile('13922786999')">复制号码</view>
 					<view class="but_close" @click="brandShow=false;">取消</view>
 				</view>
 			</view>
@@ -279,7 +279,8 @@
 					{
 						id:8,
 						title:"商学院资讯",
-						url:'/static/mine/tool_sxy.png'
+						url:'/static/mine/tool_sxy.png',
+						path:"/pages/news/news"
 					},
 					{
 						id:11,
@@ -369,10 +370,10 @@
 			jumpEnter(type){
 				// 商家入驻
 				if(type === "merchant"){
-					// uni.navigateTo({
+					uni.navigateTo({
-					// 	url:'/pages/merchant_settlement/merchant_settlement',
+						url:'/pages/merchant_settlement/merchant_settlement',
-					// })
+					})
-					this.openShow = true;
+					// this.openShow = true;
 				}else if(type === "brand"){
 					// 企业/品牌入驻
 					// uni.navigateTo({
@@ -410,7 +411,6 @@
 			}
 		},
 		beforeDestroy(){
-			console.log('beforeDestry');
 			this.statisticsObj={
 				unPayNum:0,//待支付数量
 				unSentNum:0,//待发货数量

pages/mine_authentication_ok/mine_authentication_ok.vue

@@ -3,33 +3,14 @@
 		<Header :leftTitle="$t('authentication.title')" left-path-type="switchTab" left-path="/pages/mine/mine"/>
 		<view class="authentication_ok_content" v-if="currentUserData && Object.keys(currentUserData).length !==0">
 			<view class="authentication_result">
-				<!-- <view class="result_title">您的实名认证</view>
-				<view class="result_value">{{getValue(CERT_STATUS_OPTION,currentUserData.certStatus)}}</view> -->
 				<up-image src="/static/mine/auth_ok.png" mode="widthFix" shape="circle" width="140" height="140" bgColor="#f1f6ff00" :fade="true" duration="450"></up-image>
 				<view class="result_value">{{getValue(CERT_STATUS_OPTION,currentUserData.certStatus)}}</view>
 			</view>
-			<!-- <view class="authentication_info">
+			<view v-if="currentUserData.certStatus === 3" class="reauthentication_warp">
-				<view class="info_item">
+				<view class="reauthentication_but_warp" @click="reauthenticationFun">
-					<text class="info_item_title">证件姓名：</text>
+					重新认证
-					<text class="info_item_value">{{currentUserData.name}}</text>
-				</view>
-				<view class="info_item">
-					<text class="info_item_title">证件类型：</text>
-					<text class="info_item_value">{{getValue(CERT_OPTION,currentUserData.certType)}}!</text>
-				</view>
-				<view class="info_item">
-					<text class="info_item_title">证件正面：</text>
-					<view class="info_item_value">
-						<up-image :src="currentUserData.certFimg" mode="widthFix" width="100%" height="140" bgColor="#f1f6ff00" :fade="true" duration="450"></up-image>
 				</view>
 			</view>
-				<view class="info_item">
-					<text class="info_item_title">证件背面：</text>
-					<view class="info_item_value">
-						<up-image :src="currentUserData.certBimg" mode="widthFix" width="100%" height="140" bgColor="#f1f6ff00" :fade="true" duration="450"></up-image>
-					</view>
-				</view>
-			</view> -->
 		</view>
 		<view v-else class="not_order_warp">
 			<up-image src="/static/common/not_order.png" width="80" height="80" bgColor="#f1f6ff00"></up-image>
@@ -68,10 +49,17 @@
 				const result = await getUserInfo();
 				if(result && result.bizcode === 100){
 					const data = result.data;
-					console.log("data",data);
 					this.currentUserData = result.data || {};
 				}
 			},
+			/**
+			 * 重新认证
+			 */
+			reauthenticationFun(){
+				uni.navigateTo({
+					url:'/pages/mine_authentication/mine_authentication',
+				})
+			}
 		}
 	}
 </script>
@@ -101,6 +89,19 @@
 				line-height: 80rpx;
 			}
 		}
+		.reauthentication_warp{
+			display: grid;
+			justify-content: center;
+			.reauthentication_but_warp{
+				margin-top: 100rpx;
+				border: 1rpx solid $app-zt-color;
+				color: $app-zt-color;
+				padding: 8rpx 10rpx;
+				width: 200rpx;
+				border-radius: 10rpx;
+				text-align: center;
+			}
+		}
 		.authentication_info{
 			background: #F8F8F8;
 			border-radius: 10rpx;

pages/mine_bank_card/mine_bank_card.vue

@@ -29,6 +29,7 @@
 				添加银行卡
 			</view>
 		</view>
+		<up-toast ref="uToastRef"></up-toast>
 	</view>
 </template>
 
@@ -36,23 +37,42 @@
 	import { getBankList,bindBank,unbind } from '@/api/bank.js';
 	import { encipherBankNumber } from '@/utils/index.js';
 	import Header from '@/components/header.vue';
+	import { getUserInfo } from '@/api/auth.js'
 	
 	export default {
 		components:{Header},
 		data() {
 			return {
 				bankList:[],
+				currentUserData:{},
 			}
 		},
 		onLoad() {
 			this.getBankList();
+			this.getUserInfo();
 		},
 		methods: {
 			encipherBankNumber,
 			jumpAddBank(){
+				const currentUserData = this.currentUserData;
+				if(currentUserData && Object.keys(currentUserData).length !==0 && currentUserData.certStatus && currentUserData.certStatus !== 0){
 					uni.navigateTo({
 						url:'/pages/mine_bank_add/mine_bank_add',
 					})
+				}else{
+					this.$refs.uToastRef.show({
+						type: 'error',
+						message: "还未进行实名认证，认证完才能绑定银行卡信息",
+					});
+				}
+			},
+			// 查询用户等级
+			async getUserInfo(){
+				const result = await getUserInfo();
+				if(result && result.bizcode === 100){
+					const data = result.data;
+					this.currentUserData = result.data || {};
+				}
 			},
 			async getBankList(){
 				const resp = await getBankList();

pages/mine_my_team_list/mine_my_team_list.vue

@@ -33,7 +33,7 @@
 			</view>
 			<scroll-view scroll-y="true" @scrolltolower="loadMore" :style="{'height': 'calc(100vh - 500rpx)'}">
 				<view class="team_item" v-for="(item,index) in listData" :key="item.id" v-if="listData && listData.length">
-					<view class="team_header" @click="jumpNextLevel(item)">
+					<view class="team_header" @click="queryLowerFun(item,index)">
 						<view class="header_left_">
 							<view style="margin-top: 10rpx;">
 								<up-image :src="item.userUrl || '/static/logo.png'" width="50" height="50" bgColor="#f1f6ff00" shape="circle" radius='16'></up-image>
@@ -49,7 +49,31 @@
 							</view>
 						</view>
 						<view>
-							<up-image src="/static/common/right_x.png" width="20" height="20" bgColor="#f1f6ff00" radius='16'></up-image>
+							<up-image src="/static/common/right_x.png" width="20" height="20" bgColor="#f1f6ff00" radius='16' v-if="!item.isOpen"></up-image>
+							<up-image src="/static/common/buttom_x.png" width="20" height="20" bgColor="#f1f6ff00" radius='16' v-else></up-image>
+						</view>
+					</view>
+					<view style="padding: 10rpx;" v-if="item.isOpen && item.lowerData">
+						<view class="team_lower">
+							<view class="team_lower_item">
+								<view class="title_">总订单金额</view>
+								<view class="val_">{{item.lowerData.teamAmount}}</view>
+							</view>
+							<view class="team_lower_fg"></view>
+							<view class="team_lower_item">
+								<view class="title_">直推人数</view>
+								<view class="val_">{{item.lowerData.ztCount}}</view>
+							</view>
+							<view class="team_lower_fg"></view>
+							<view class="team_lower_item">
+								<view class="title_">间推人数</view>
+								<view class="val_">{{item.lowerData.jtCount}}</view>
+							</view>
+							<view class="team_lower_fg"></view>
+							<view class="team_lower_item">
+								<view class="title_">总人数</view>
+								<view class="val_">{{item.lowerData.teamCount}}</view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -141,7 +165,8 @@
 				// 模拟异步获取数据，实际应用中应该替换为你的数据获取逻辑，例如API调用
 				const newData = await this.fetchData();
 				if(newData.entitys && newData.entitys.length !==0){
-					this.listData = [...this.listData, ...newData.entitys]; // 将新数据添加到列表中
+					const data = newData.entitys.map(item=>({...item,isOpen:false}));
+					this.listData = [...this.listData, ...data]; // 将新数据添加到列表中
 					this.form.page++; // 页码加1
 				}
 			  } catch (error) {
@@ -165,6 +190,26 @@
 			// 当滚动到底部时触发的方法
 			loadMore() {
 				this.loadData(); // 加载更多数据
+			},
+			/**
+			 * 查询团队下级数据
+			 * @param {Object} item
+			 * @param {Object} index
+			 */
+			async queryLowerFun(item,index){
+				const data = this.listData[index];
+				const type = !data.isOpen
+				if(type){
+					const params={
+						userId : item.userId,
+					}
+					const resp = await getJuniorSummary(params);
+					if(resp && resp.bizcode === 100){
+						data.lowerData = resp.data;
+					}
+				}
+				data.isOpen = type;
+				this.listData[index] = data;
 			}
 		}
 	}
@@ -244,9 +289,6 @@
 			margin-bottom: 10rpx;
 		}
 		.team_item{
-			padding: 20rpx;
-			background: #FFFFFF;
-			border-radius: 30rpx;
 			margin-bottom: 20rpx;
 		}
 		.team_header{
@@ -254,7 +296,9 @@
 			align-content: center;
 			justify-content: space-between;
 			align-items: center;
-			margin-bottom: 10rpx;
+			border-radius: 8rpx;
+			background: #FFFFFF;
+			padding: 20rpx;
 			.header_left_{
 				display: flex;
 				align-items: inherit;
@@ -276,7 +320,31 @@
 				margin-top: 10rpx;
 			}
 		}
-	
+		.team_lower{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background: #E9E9E9;
+			border-radius: 4px;
+			padding: 30rpx 20rpx;
+			.team_lower_fg{
+				border-right: 1px solid rgba(0,0,0,0.26);
+				height: 36rpx;
+			}
+			.team_lower_item{
+				text-align: center;
+			}
+			.title_{
+				font-size: 10px;
+				color: rgba(0,0,0,0.6);
+			}
+			.val_{
+				font-weight: 500;
+				font-size: 14px;
+				color: rgba(0,0,0,0.9);
+				margin-top: 20rpx;
+			}
+		}
 		.team_content{
 			border-top: 1rpx solid #EEEEEE;
 			padding: 20rpx 0 0;

pages/mine_order/mine_order.vue

@@ -79,7 +79,7 @@
 							<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
 							<view class="operate_comm operate_but_2" v-if="item.status === ORDER_TYPE.NOT_RECEIVE" @click="confirmReceiptOk(item)">确认收货</view>
 							<!-- <view class="operate_comm operate_but_3" v-if="item.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
-							<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.COMPLETED">申请售后</view> -->
+							<view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.NOT_RECEIVE,ORDER_TYPE.UNSHIPPED].includes(item.status)" @click="afterShow=true;">申请售后</view>
 							<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
 							<!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(item.status)">删除记录</view> -->
 							<!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(item.status)">再次购买</view> -->
@@ -143,6 +143,51 @@
 				</view>
 			</view>
 		</up-modal>
+		<!-- 申请售后 -->
+		<up-modal :show="afterShow" :showConfirmButton = "false">
+			<view class="slot-content">
+				<view class="close_warp" @click="afterShow=false;">
+					<up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
+				</view>
+				<view class="content_">
+					<view class="content_1">售后联系方式</view>
+					<view class="content_2">如遇退/换货等问题，请联系客服处理</view>
+					<view class="content_3">
+						<view style="margin-left: 20rpx;">
+							<up-image src="/static/common/kf_dh.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
+						</view>
+						<view class="content_info">
+							<view class="content_info_title">客服电话</view>
+							<view class="content_info_mobile">
+								139 2278 6999
+								<view style="margin-left: 20rpx;">
+									<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyMobile(13922786999)"></up-image>
+								</view>
+							</view>
+						</view>
+						
+					</view>
+					<view class="content_3">
+						<view style="margin-left: 20rpx;">
+							<up-image src="/static/common/kf_wx.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
+						</view>
+						<view class="content_info">
+							<view class="content_info_title">客服微信</view>
+							<view class="content_info_mobile">
+								139 2278 6999
+								<view style="margin-left: 20rpx;">
+									<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00" @click="copyMobile(13922786999)"></up-image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="but_">
+					<!-- <view class="but_copy" @click="copyMobile('13922786999')">复制号码</view> -->
+					<view class="but_close" @click="afterShow=false;">确定</view>
+				</view>
+			</view>
+		</up-modal>
 	</view>
 </template>
 
@@ -225,6 +270,7 @@
 				},
 				loading: false, // 加载状态标志
 				openShow:false,
+				afterShow:false,// 售后申请
 			}
 		},
 		onLoad(options) {
@@ -237,6 +283,10 @@
 			getValue,
 			formatDate1,
 			copyData,
+			copyMobile(mobile){
+				copyData(mobile);
+				this.afterShow = false;
+			},
 			jumpLeft(){
 				uni.switchTab({
 				    url: '/pages/mine/mine',
@@ -286,6 +336,7 @@
 				if(newData.entitys && newData.entitys.length !==0){
 					this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
 					this.form.page++; // 页码加1
+					console.log("this.orderList",this.orderList);
 				}
 			  } catch (error) {
 				console.error('加载数据失败:', error);
@@ -517,4 +568,45 @@
 		font-weight: bold;
 		font-size: 18rpx;
 	}
+	.content_2{
+		font-size: 26rpx;
+		color: rgba(0,0,0,0.4);
+		margin-bottom: 40rpx;
+	}
+	.content_3{
+		display: flex;
+		background: #FFFFFF;
+		box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.06);
+		border-radius: 12rpx;
+		.content_info{
+			display: grid;
+			margin-left: 20rpx;
+			text-align: left;
+		}
+		.content_info_title{
+			font-weight: 600;
+			font-size: 26rpx;
+			color: rgba(0,0,0,0.9);
+			line-height: 38rpx;
+		}
+		.content_info_mobile{
+			font-size: 30rpx;
+			color: rgba(0,0,0,0.4);
+			display: flex;
+		}
+	}
+	.but_{
+		display: flex;
+		justify-content: center;
+		margin-top: 40rpx;
+	}
+	.but_close{
+		background: #F24A00;
+		box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(242,74,0,0.5);
+		border-radius: 41rpx;
+		width: 60%;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+		color: #FFFFFF;
+	}
 </style>

pages/mine_order_info/mine_order_info.vue

@@ -137,7 +137,7 @@
 			</view>
 			
 			<!-- 支付方式 -->
-			<view class="order_way_warp" @click="wayShow = true;" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
+			<view class="order_way_warp" @click="wayShowFun(true)" v-if="orderInfo.status === ORDER_TYPE.UNPAID">
 				<view>支付方式</view>
 				<view class="order_way_right">
 					{{getValue(wayOption,wayForm.payway)}}
@@ -167,10 +167,11 @@
 				    v-model="wayForm.payway"
 				    placement="column"
 				  >
-					  <view class="way_item" v-for="item in wayOption" :key="item.type">
+					<view v-for="item in wayOption" :key="item.id" style="margin-bottom: 10rpx;">
+						<view class="way_item">
 							<view class="way_item_">
 								<!-- <view style="margin-top: 2rpx;"><up-image :src="item.path" width="20" height="20" bgColor="#f1f6ff00"></up-image></view> -->
-							<view class="way_item_val">{{item.name}}<text v-if="item.balance">&nbsp;&nbsp;({{item.balance}})</text></view>
+								<view class="way_item_val">{{item.name}}<text v-if="item.balance">&nbsp;&nbsp;(￥{{item.balance}})</text></view>
 							</view>
 							<up-radio
 							  :name="item.type"
@@ -178,6 +179,8 @@
 							>
 							</up-radio>
 						</view>
+						<view class="balance_comm_msg" v-if="item.type === 'balance' && isShowBalance">当前现金余额不足，如需支付请前往充值</view>
+					</view>
 				</up-radio-group>
 				<view class="popup_but" @click="wayShow = false;">
 					确认
@@ -218,13 +221,19 @@
 				wayShow:false,
 				wayOption:[],// 支付选项
 				height:'180rpx',
+				isShowBalance:false,
 			}
 		},
 		onLoad(options) {
 			const id = options.id;
 			this.id = id ? parseInt(id,10) : 0;
 			this.getOrderInfo();
+			const payOpen = options.payOpen;
+			// 支付弹框
+			if(payOpen && payOpen !=="null"){
 				this.getWayOption();
+				this.wayShow = payOpen;
+			}
 		},
 		methods: {
 			getValue,
@@ -237,10 +246,26 @@
 					url:"/pages/mine_order/mine_order?type="+this.orderInfo.status,
 				})
 			},
+			wayShowFun(type){
+				if(type){
+					this.getWayOption();
+				}
+				this.wayShow=type;
+			},
 			async getWayOption(){
 				const result = await getSupportPay();
 				if(result && result.bizcode === 100){
-					this.wayOption = result.data;
+					const data = result.data || [];
+					const amount = this.orderInfo.sumAmount;
+					let flag = data.some(item => ['wechat','alipay'].includes(item.type));
+					// 没有支付宝和微信支付
+					if(flag){
+						this.isShowBalance = false;
+					}else{
+						const balanceFlag = data.some(item => item.type === "balance" && item.balance < amount);
+						this.isShowBalance = balanceFlag;
+					}
+					this.wayOption = data;
 				}
 			},
 			// 查询订单详情
@@ -347,6 +372,14 @@
 					this.form.page = 1;
 					this.loadData();
 				}
+			},
+			/**
+			 * 去充值
+			 */
+			goRechargeFun (item){
+				uni.navigateTo({
+					url:"/pages/mine_purse_recharge/mine_purse_recharge?category=balance&amount="+item.balance+"&back=orderInfo&id="+this.id,
+				})
 			}
 		}
 	}

pages/mine_purse_recharge/mine_purse_recharge.vue

@@ -3,7 +3,7 @@
 		<Header 
 			:leftTitle="$t('purse.recharge.title')" 
 			left-path-type="navigateTo" 
-			left-path="/pages/mine_purse/mine_purse" 
+			:left-path="leftPath" 
 			style="background-color: #FFFFFF;"
 		/>
 		<view class="purse_recharge_cntent">
@@ -40,7 +40,6 @@
 					  >
 						  <view :class="index+1 < wayOption.length ? 'way_item way_item_but':'way_item'" v-for="(item,index) in wayOption" :key="item.id">
 							<view class="way_item_">
-								<!-- <view style="margin-top: 2rpx;"><up-image :src="item.path" width="20" height="20" bgColor="#f1f6ff00"></up-image></view> -->
 								<view class="way_item_val">{{item.name}}<text v-if="item.balance">&nbsp;&nbsp;({{item.balance}})</text></view>
 							</view>
 							<up-radio
@@ -77,6 +76,7 @@
 				},
 				wayOption:[],
 				proAmount:0,
+				leftPath:'/pages/mine_purse/mine_purse',
 			}
 		},
 		onLoad(option) {
@@ -88,6 +88,17 @@
 			if(amount && amount !== 'null'){
 				this.proAmount = amount;
 			}
+			const back = option.back;
+			if(back && back !== 'null'){
+				if(back === "submit"){
+					const id = option.id;
+					this.leftPath = "/pages/order_submit/order_submit?payOpen=true&ids="+id;
+				}
+				if(back === "orderInfo"){
+					const id = option.id;
+					this.leftPath = "/pages/mine_order_info/mine_order_info?payOpen=true&id="+id;
+				}
+			}
 		},
 		mounted() {
 			this.getWayOption();

pages/news/news.vue

@@ -0,0 +1,256 @@
+<template>
+	<view class="news_warp">
+		<Header
+			leftTitle="商学院" 
+			left-path-type="switchTab" 
+			left-path="/pages/mine/mine" 
+			style="background-color: #FFFFFF;"
+		/>
+		<view class="news_content_warp">
+			<view class="heder_">
+				<view 
+					v-for="item in titleList" 
+					:key="item.key" 
+					:class="form.type === item.key ? 'heder_item_sel heder_item':'heder_item'" 
+					@click="headerClick(item)"
+				>
+					{{item.value}}
+				</view>
+			</view>
+			<view style="padding: 20rpx 0;">
+				<up-swiper
+					:list="swiperList"
+					height="120"
+					radius="10"
+					@change="e => currentNum = e.current"
+					bgColor="#ffffff00"
+				>
+					<template #indicator>
+						<view
+							class="indicator-num"
+						>
+							<text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
+						</view>
+					</template>
+				</up-swiper>
+			</view>
+		</view>
+		<view class="content_">
+			<scroll-view scroll-y="true" @scrolltolower="loadMore" style="height:calc(100vh - 560rpx)">
+				<up-input
+					placeholder="搜索关键字" 
+					v-model="form.keywork" 
+					prefixIcon="search" 
+					prefixIconStyle="font-size: 22px;color: #909399"
+					:customStyle="inputCss"
+				>
+					<template #suffix>
+						<view @click="searchTap" class="search_but">
+							搜索
+						</view>
+					</template>
+				</up-input>
+				
+				<view class="news_content_item" v-for="item in newsList" :key="item.id" v-if="newsList && newsList.length !==0" @click="jumpInfo(item)">
+					<view class="news_content_item_title">{{item.title}}</view>
+					<view v-html="item.content" class="news_content_item_content"></view>
+					<view class="news_content_item_info">
+						<view>{{formatDate(item.ctdate)}}</view>
+						<view class="browses_">
+							<view>
+								<up-image src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
+							</view>
+							<view style="margin-left: 8rpx;">{{item.browses}}</view>
+						</view>
+					</view>
+				</view>
+				<view v-else class="not_order_warp">
+				  	<up-image src="/static/common/not_order.png" width="80" height="80" bgColor="#f1f6ff00"></up-image>
+				  	<view class="not_order_msg_warp">还未发布新闻哦～</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Header from '@/components/header.vue';
+	import { NEWS_TYPE,APP_PAGE_TYPE } from '@/utils/enumUtils.js';
+	import { getCarouselImage } from '@/api/common.js';
+	import { getNewsList } from '@/api/news.js';
+	import { formatDate } from '@/utils/index.js'
+	
+	export default {
+		components:{Header},
+		data() {
+			return {
+				titleList:NEWS_TYPE,
+				swiperList:[],
+				currentNum:0,
+				form:{
+					keywork:null,
+					type:1,
+					page:1,
+					pageSize:15,
+				},
+				inputCss:{
+					"height":'68rpx',
+					"background": "#FFFFFF",
+					"border-radius": "16rpx",
+					"border": "0rpx",
+					"padding": "0 0 0 16px",
+				},
+				newsList:[],
+				newsListTotal:0,
+				loading:false,
+			}
+		},
+		onLoad(option) {
+			this.getCarouselImage();
+			this.loadData();
+		},
+		methods: {
+			formatDate,
+			// 查询轮播图
+			async getCarouselImage(){
+				const params={
+					pageUi:APP_PAGE_TYPE.NEWS,
+				}
+				const resp = await getCarouselImage(params);
+				if(resp && resp.bizcode === 100){
+					const data = resp.data || [];
+					this.swiperList = data.length !== 0 ? data.map(obj=>obj.carouselImage) : [];
+				}
+			},
+			headerClick(item){
+				this.form.type = item.key;
+				this.searchTap();
+			},
+			
+			// 搜索
+			searchTap(){
+				this.newsList = [];
+				this.form.page = 1;
+				this.loadData();
+			},
+			// 加载数据的方法
+			async loadData() {
+			  if (this.loading) return; // 如果正在加载，则不重复加载
+			  this.loading = true; // 设置加载状态为true
+			  try {
+				const newData = await this.fetchData(this.form.page, this.form.pageSize);
+				if(newData.entitys && newData.entitys.length !==0){
+					this.newsList = [...this.newsList, ...newData.entitys]; // 将新数据添加到列表中
+					this.form.page++; 
+				}
+			  } catch (error) {
+				console.error('加载数据失败:', error);
+			  } finally {
+				this.loading = false; // 设置加载状态为false
+			  }
+			},
+			// 模拟获取数据的方法，实际应用中应该替换为你的数据获取逻辑，例如从服务器获取数据
+			async fetchData(page, pageSize) {
+				const form = this.form;
+				const params = {
+					page,
+					pageSize,
+					type:form.type,
+				}
+				if(form.keywork){
+					params.keywork = form.keywork;
+				}
+				const data = await getNewsList(params);
+				if(data && data.bizcode === 100 && data.data){
+					return data.data
+				}else{
+					return [];
+				}
+			},
+			// 当滚动到底部时触发的方法
+			loadMore() {
+				this.loadData(); // 加载更多数据
+			},
+			
+			/**
+			 * 跳转到详情
+			 * @param {Object} item
+			 */
+			jumpInfo(item){
+				uni.navigateTo({
+					url:'/pages/news_info/news_info?id='+item.id,
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.news_warp{
+		overflow: hidden;
+		.news_content_warp{
+			padding: 0 30rpx 30rpx;
+		}
+		.heder_{
+			display: flex;
+			align-items: center;
+			.heder_item{
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #666666;
+				margin-right: 30rpx;
+			}
+			.heder_item_sel{
+				font-weight: bold;
+				font-size: 36rpx;
+				color: #000000;
+			}
+		}
+		.content_{
+			padding: 30rpx;
+			background: $app-bj;
+			border-radius: 30rpx 30rpx 0rpx 0rpx;
+			// height: calc(100vh - 560rpx);
+			// overflow: auto;
+			.search_but{
+				line-height: 68rpx;
+				background: $app-bt-bj;
+				border-radius: 16rpx;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				padding: 0 40rpx;
+			}
+			.news_content_item{
+				background: #FFFFFF;
+				padding: 30rpx;
+				margin-top: 20rpx;
+			}
+			.news_content_item_title{
+				font-weight: 800;
+				font-size: 36rpx;
+				color: #000000;
+			}
+			.news_content_item_content{
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+				 display: -webkit-box;
+				  -webkit-box-orient: vertical;
+				  -webkit-line-clamp: 2; 
+				  overflow: hidden;
+				  margin-top: 10rpx;
+			}
+			.news_content_item_info{
+				margin-top: 30rpx;
+				display: flex;
+				justify-content: space-between;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #666666;
+				.browses_{
+					display: flex;
+				}
+			}
+		}
+	}
+</style>

pages/news_info/news_info.vue

@@ -0,0 +1,108 @@
+<template>
+	<view class="news_info_warp">
+		<Header
+			leftTitle="" 
+			left-path-type="navigateTo" 
+			left-path="/pages/news/news" 
+			style="background-color: #FFFFFF;"
+		/>
+		<view class="news_info_header_warp">
+			<view class="title_">{{newsDetail.title}}</view>
+			<view class="avatar_">
+				<view>
+					<up-image :src="newsDetail.avatar_url" width="40" height="40" bgColor="#f1f6ff00" shape="circle"></up-image>
+				</view>
+				<view style="margin-left: 12rpx;">{{newsDetail.name}}</view>
+			</view>
+			<view class="time_">
+				<view>{{formatDate(newsDetail.ctdate)}}</view>
+				<view class="browses_">
+					<view>
+						<up-image src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
+					</view>
+					<view style="margin-left: 8rpx;">{{newsDetail.browses}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="news_info_fg_warp"></view>
+		<view class="news_info_content_warp" v-html="newsDetail.content"></view>
+	</view>
+</template>
+
+<script>
+	import Header from '@/components/header.vue';
+	import { getNewsDetail } from '@/api/news.js';
+	import { formatDate } from '@/utils/index.js';
+	
+	export default {
+		components:{Header},
+		data() {
+			return {
+				id:0,
+				newsDetail:{}
+			}
+		},
+		onLoad(option) {
+			const id = option.id;
+			if(id && id !=="null"){
+				this.id = id;
+				this.fetchData();
+			}
+		},
+		methods: {
+			formatDate,
+			async fetchData() {
+				const id = this.id;
+				const params = {
+					id,
+				}
+				const resp = await getNewsDetail(params);
+				if(resp && resp.bizcode === 100){
+					this.newsDetail = resp.data || {};
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.news_info_warp{
+		overflow: hidden;
+	}
+	.news_info_header_warp{
+		padding: 30rpx;
+		.title_{
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #333333;
+		}
+		.avatar_{
+			display: flex;
+			align-items: center;
+			margin-top: 20rpx;
+		}
+		.time_{
+			display: flex;
+			justify-content: space-between;
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #666666;
+			margin-top: 10rpx;
+			.browses_{
+				display: flex;
+			}
+		}
+	}
+	.news_info_fg_warp{
+		height: 10rpx;
+		background-color: $app-bj;
+		width: 100%;
+	}
+	.news_info_content_warp{
+		padding: 30rpx;
+		height: calc(100vh - 524rpx);
+		overflow: auto;
+		font-size: 28rpx;
+		color: #333333;
+	}
+</style>

pages/order_submit/order_submit.vue

@@ -98,7 +98,7 @@
 		
 	
 		<!-- 支付方式 -->
-		<view class="order_way_warp" @click="wayShow = true;">
+		<view class="order_way_warp" @click="wayShowFun(true)">
 			<view>支付方式</view>
 			<view class="order_way_right">
 				{{getValue(wayOption,orderInfo.paymentMethod)}}
@@ -119,17 +119,21 @@
 				    v-model="orderInfo.paymentMethod"
 				    placement="column"
 				  >
-					  <view class="way_item" v-for="item in wayOption" :key="item.id">
+					<view v-for="item in wayOption" :key="item.id" style="margin-bottom: 10rpx;">
+						<view class="way_item" >
 							<view class="way_item_">
-							<!-- <view style="margin-top: 2rpx;"><up-image :src="item.path" width="20" height="20" bgColor="#f1f6ff00"></up-image></view> -->
 								<view class="way_item_val">{{item.name}}<text v-if="item.balance">&nbsp;&nbsp;({{item.balance}})</text></view>
 							</view>
+							<view v-if="item.type === 'balance' && isShowBalance" class="go_balance_comm_warp" @click="goRechargeFun(item)">去充值</view>
 							<up-radio
+								v-else
 								:name="item.type"
-						  activeColor="#FF7C41"
+								activeColor="#03AD27"
 							>
 							</up-radio>
 						</view>
+						<view class="balance_comm_msg" v-if="item.type === 'balance' && isShowBalance">当前现金余额不足，如需支付请前往充值</view>
+					</view>
 				</up-radio-group>
 				<view class="popup_but" @click="wayShow=false;">
 					确认
@@ -193,33 +197,28 @@
 				shopsIndex:0,// 收件地址数据类型
 				selectAddress:{},// 收件地址选择
 				wayOption:[],
-				// leftPath:'',
+				isShowBalance:false,
-				// leftPathType:'',
 			};
 		},
 		onLoad(option) {
 			const ids = option.ids;
-			console.log("ids",ids);
 			if(ids && ids!=="null"){
 				this.ids = ids;
 				this.getOrder();
-				// const idsArr = ids.split(",");
-				// console.log("idsArr.length",idsArr.length);
-				// if(idsArr.length >1){
-				// 	this.leftPath = "/pages/sort/sort";
-				// 	this.leftPathType = "switchTab"
-				// }else{
-				// 	this.leftPath = "/pages/productInfo/productInfo?id="+ids;
-				// 	this.leftPathType = "navigateTo"
-				// }
 			}
 			const addressShow = option.addressShow;
 			if(addressShow && addressShow !=="null"){
 				this.addressShow = addressShow;
 			}
+			// 支付弹框
+			const payOpen = option.payOpen;
+			if(payOpen && payOpen !=="null"){
+				this.getWayOption();
+				this.wayShow = payOpen;
+			}
 		},
 		mounted() {
-			this.getWayOption();
+			
 		},
 		methods: {
 			getValue,
@@ -232,10 +231,26 @@
 					url:"/pages/mine_address_add/mine_address_add?ids="+ids,
 				})
 			},
+			wayShowFun(type){
+				if(type){
+					this.getWayOption();
+				}
+				this.wayShow=type;
+			},
 			async getWayOption(){
 				const result = await getSupportPay();
 				if(result && result.bizcode === 100){
-					this.wayOption = result.data;
+					const data = result.data || [];
+					const amount = this.orderInfo.amount;
+					let flag = data.some(item => ['wechat','alipay'].includes(item.type));
+					// 没有支付宝和微信支付
+					if(flag){
+						this.isShowBalance = false;
+					}else{
+						const balanceFlag = data.some(item => item.type === "balance" && item.balance < amount);
+						this.isShowBalance = balanceFlag;
+					}
+					this.wayOption = data;
 				}
 			},
 			async getOrder(){
@@ -437,10 +452,17 @@
 				this.shopsIndex = index;
 			},
 			jumpProductInfo(item){
-				console.log("item",item);
 				uni.navigateTo({
 					url:"/pages/productInfo/productInfo?id="+item.goodsId,
 				})
+			},
+			/**
+			 * 去充值
+			 */
+			goRechargeFun (item){
+				uni.navigateTo({
+					url:"/pages/mine_purse_recharge/mine_purse_recharge?category=balance&amount="+item.balance+"&back=submit&id="+this.ids,
+				})
 			}
 		}
 	}

pages/preference/preference.vue

@@ -49,22 +49,34 @@
 
 <script>
 	import { searchList } from '@/api/product.js';
-	import { SEARCH_TYPE } from '@/utils/enumUtils.js';
+	import { SEARCH_TYPE,APP_PAGE_TYPE } from '@/utils/enumUtils.js';
+	import { getCarouselImage } from '@/api/common.js';
+		
 		
 	export default {
 		data() {
 			return {
-				swiperList:[
+				swiperList:[],
-					'/static/home/banner03.png',  
-				],
 				productList:[],
 				productListLoading:false,
 			}
 		},
 		onLoad() {
 			this.getSearchList();
+			this.getCarouselImage();
 		},
 		methods: {
+			// 查询轮播图
+			async getCarouselImage(){
+				const params={
+					pageUi:APP_PAGE_TYPE.GOOD,
+				}
+				const resp = await getCarouselImage(params);
+				if(resp && resp.bizcode === 100){
+					const data = resp.data || [];
+					this.swiperList = data.length !== 0 ? data.map(obj=>obj.carouselImage) : [];
+				}
+			},
 			jumpHome(){
 				uni.switchTab({
 				    url: '/pages/home/home',

pages/productInfo/productInfo.vue

@@ -42,7 +42,7 @@
 					<view>
 					</view>
 					<!-- 销量还需要改 -->
-					<view>销量1.5万件</view>
+					<view>销量{{orderInfo.sales}}件</view>
 				</view>
 			</view>
 			

pages/search/search.vue

@@ -63,7 +63,7 @@
 										<text>￥</text>
 										<text style="font-size: 36rpx;">{{item.adPrice}}</text>
 									</view>
-									<view>已售9999件</view>
+									<view>已售{{item.sales}}件</view>
 								</view>
 							</view>
 						</view>
@@ -79,7 +79,7 @@
 										<text>￥</text>
 										<text style="font-size: 36rpx;">{{item.adPrice}}</text>
 									</view>
-									<view>已售9999件</view>
+									<view>已售{{item.sales}}件</view>
 								</view>
 							</view>
 						</view>

pages/sort/sort.vue

@@ -71,8 +71,9 @@
 </template>
 
 <script>
-	import { getCascadeCategory } from '@/api/common.js';
+	import { getCascadeCategory,getCarouselImage } from '@/api/common.js';
 	import CustomTabBar from '@/components/custom-tab-bar.vue';
+	import { APP_PAGE_TYPE } from '@/utils/enumUtils.js'
 	
 	export default {
 		components:{CustomTabBar},
@@ -83,11 +84,7 @@
 				current: null, // 预设当前项的值
 				menuHeight: 0, // 左边菜单的高度
 				menuItemHeight: 0, // 左边菜单item的高度
-				bannerList:[
+				bannerList:[],
-					'/static/common/product_def_banner.png',
-					'/static/common/product_def_banner.png',
-					'/static/common/product_def_banner.png'
-				],
 				tabbarList:[],// 左侧的主分类
 				tabbarContentList:[],// 右侧内容的分类
 				tabbarContentLoading:false,
@@ -99,8 +96,6 @@
 				animation: false
 			  })
 			/*#endif*/
-		},
-		onShow() {
 			const then = this;
 			this.getSort(0).then(resp=>{
 				if(resp && resp.length !==0){
@@ -125,11 +120,23 @@
 					}
 				}
 			});
+			this.getCarouselImage();
 		},
 		methods: {
 			checkCategory(val){
 				this.selCategory = val;
 			},
+			// 查询轮播图
+			async getCarouselImage(){
+				const params={
+					pageUi:APP_PAGE_TYPE.SORT,
+				}
+				const resp = await getCarouselImage(params);
+				if(resp && resp.bizcode === 100){
+					const data = resp.data || [];
+					this.bannerList = data.length !== 0 ? data.map(obj=>obj.carouselImage) : [];
+				}
+			},
 			jumpSearch(item){
 				let path = "/pages/search/search";
 				if(item && Object.keys(item).length !==0){

pages/welcome/welcome.vue

@@ -49,22 +49,34 @@
 
 <script>
 	import { searchList } from '@/api/product.js';
-	import { SEARCH_TYPE } from '@/utils/enumUtils.js';
+	import { SEARCH_TYPE,APP_PAGE_TYPE } from '@/utils/enumUtils.js';
+	import { getCarouselImage } from '@/api/common.js';
+	
 	
 	export default {
 		data() {
 			return {
-				swiperList:[
+				swiperList:[],
-					'/static/home/banner05.png',  
-				],
 				productList:[],
 				productListLoading:false,
 			}
 		},
 		onLoad() {
 			this.getSearchList();
+			this.getCarouselImage();
 		},
 		methods: {
+			// 查询轮播图
+			async getCarouselImage(){
+				const params={
+					pageUi:APP_PAGE_TYPE.HOT,
+				}
+				const resp = await getCarouselImage(params);
+				if(resp && resp.bizcode === 100){
+					const data = resp.data || [];
+					this.swiperList = data.length !== 0 ? data.map(obj=>obj.carouselImage) : [];
+				}
+			},
 			jumpHome(){
 				uni.switchTab({
 				    url: '/pages/home/home',

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/453548d0-2d41-11f0-afa2-87894c3ed601
+https://app.liuyingyong.cn/build/download/98b15450-316c-11f0-87b4-efe40098fc8a

unpackage/dist/build/app-plus/manifest.json

@@ -8,7 +8,7 @@
   "name": "德商汇",
   "version": {
     "name": "1.0.1",
-    "code": 106
+    "code": 109
   },
   "description": "德商汇优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
   "developer": {
@@ -134,7 +134,7 @@
     "uni-app": {
       "control": "uni-v3",
       "vueVersion": "3",
-      "compilerVersion": "4.55",
+      "compilerVersion": "4.64",
       "nvueCompiler": "uni-app",
       "renderer": "auto",
       "nvue": {

unpackage/dist/dev/.sourcemap/mp-weixin/api/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sources":["api/common.js"],"sourcesContent":["import request from '@/utils/request.js'; // 引入封装的方法\r\n// import { APPID } from '@/utils/config.js';\r\n\r\n\r\n// 获取短信验证码\r\nexport function getUserList(data) {\r\n\t// data.appId = APPID;\r\n\treturn request({\r\n\t    url: \"/common/getSmsCode\",\r\n\t    method: \"post\",\r\n\t    data,\r\n\t  });\r\n}\r\n\r\n// 查询级联地区\r\nexport function getCascadeRegion(data) {\r\n\treturn request({\r\n\t    url: \"/common/getCascadeRegion\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t  });\r\n}\r\n \r\n // 查询级联类目\r\n export function getCascadeCategory(data) {\r\n \treturn request({\r\n \t    url: \"/common/getCascadeCategory\",\r\n \t    method: \"get\",\r\n \t    data,\r\n\t\tisShowLoading:false,\r\n \t  });\r\n }\r\n \r\n \r\n// 查询支持的银行\r\nexport function getSupportBank(data) {\r\n\treturn request({\r\n\t    url: \"/common/getSupportBank\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n// 获取短信验证码\r\nexport function uploadImage(params) {\r\n\tconst formData = new FormData();\r\n\tformData.append(\"file\", params.file);\r\n\tformData.append(\"type\", params.type);\r\n\treturn request.post('/common/upload/image',formData);\r\n}\r\n\r\nexport const uploadImg = \"/common/upload/image\";\r\n\r\n\r\n/**\r\n * 检查版本更新\r\n * @param {Object} data\r\n */\r\nexport function checkAppVersion(data) {\r\n\treturn request({\r\n\t    url: \"/common/checkAppVersion\",\r\n\t    method: \"post\",\r\n\t    data,\r\n\t});\r\n}"],"names":["request"],"mappings":";;AAKO,SAAS,YAAY,MAAM;AAEjC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAI;AACJ;AAGO,SAAS,iBAAiB,MAAM;AACtC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAI;AACJ;AAGQ,SAAS,mBAAmB,MAAM;AACxC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,IACJ,eAAc;AAAA,EAChB,CAAK;AACH;AAIK,SAAS,eAAe,MAAM;AACpC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAUY,MAAC,YAAY;AAOlB,SAAS,gBAAgB,MAAM;AACrC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;;;;;;;"}
+{"version":3,"file":"common.js","sources":["api/common.js"],"sourcesContent":["import request from '@/utils/request.js'; // 引入封装的方法\r\n// import { APPID } from '@/utils/config.js';\r\n\r\n\r\n// 获取短信验证码\r\nexport function getUserList(data) {\r\n\t// data.appId = APPID;\r\n\treturn request({\r\n\t    url: \"/common/getSmsCode\",\r\n\t    method: \"post\",\r\n\t    data,\r\n\t  });\r\n}\r\n\r\n// 查询级联地区\r\nexport function getCascadeRegion(data) {\r\n\treturn request({\r\n\t    url: \"/common/getCascadeRegion\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t  });\r\n}\r\n \r\n // 查询级联类目\r\n export function getCascadeCategory(data) {\r\n \treturn request({\r\n \t    url: \"/common/getCascadeCategory\",\r\n \t    method: \"get\",\r\n \t    data,\r\n\t\tisShowLoading:false,\r\n \t  });\r\n }\r\n \r\n \r\n// 查询支持的银行\r\nexport function getSupportBank(data) {\r\n\treturn request({\r\n\t    url: \"/common/getSupportBank\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n// 获取短信验证码\r\nexport function uploadImage(params) {\r\n\tconst formData = new FormData();\r\n\tformData.append(\"file\", params.file);\r\n\tformData.append(\"type\", params.type);\r\n\treturn request.post('/common/upload/image',formData);\r\n}\r\n\r\nexport const uploadImg = \"/common/upload/image\";\r\n\r\n\r\n/**\r\n * 检查版本更新\r\n * @param {Object} data\r\n */\r\nexport function checkAppVersion(data) {\r\n\treturn request({\r\n\t    url: \"/common/checkAppVersion\",\r\n\t    method: \"post\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n\r\n/**\r\n * 查询分享海报\r\n * @param {Object} data\r\n */\r\nexport function getSharePoster(data) {\r\n\treturn request({\r\n\t    url: \"/common/getSharePoster\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n/**\r\n * 生成分享海报\r\n * @param {Object} data\r\n */\r\nexport function generateSharePoster(data) {\r\n\treturn request({\r\n\t    url: \"/common/generateSharePoster\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n/**\r\n * 查询APP轮播图\r\n * @param {Object} data\r\n */\r\nexport function getCarouselImage(data) {\r\n\treturn request({\r\n\t    url: \"/common/getCarouselImage\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}"],"names":["request"],"mappings":";;AAKO,SAAS,YAAY,MAAM;AAEjC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAI;AACJ;AAGO,SAAS,iBAAiB,MAAM;AACtC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAI;AACJ;AAGQ,SAAS,mBAAmB,MAAM;AACxC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,IACJ,eAAc;AAAA,EAChB,CAAK;AACH;AAIK,SAAS,eAAe,MAAM;AACpC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAUY,MAAC,YAAY;AAOlB,SAAS,gBAAgB,MAAM;AACrC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAOO,SAAS,eAAe,MAAM;AACpC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAMO,SAAS,oBAAoB,MAAM;AACzC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAMO,SAAS,iBAAiB,MAAM;AACtC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;;;;;;;;;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/api/news.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"news.js","sources":["api/news.js"],"sourcesContent":["import request from '@/utils/request.js'; // 引入封装的方法\r\n\r\n/**\r\n * 查询资讯列表\r\n * @param {Object} params\r\n */\r\nexport function getNewsList(params) {\r\n\treturn request({\r\n\t    url: \"/fbusininfo/getList\",\r\n\t    method: \"get\",\r\n\t    data:params,\r\n\t});\r\n}\r\n\r\n/**\r\n * 查询资讯详情\r\n * @param {Object} params\r\n */\r\nexport function getNewsDetail(params) {\r\n\treturn request({\r\n\t    url: \"/fbusininfo/getDetail\",\r\n\t    method: \"get\",\r\n\t    data:params,\r\n\t});\r\n}"],"names":["request"],"mappings":";;AAMO,SAAS,YAAY,QAAQ;AACnC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,MAAK;AAAA,EACV,CAAE;AACF;AAMO,SAAS,cAAc,QAAQ;AACrC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,MAAK;AAAA,EACV,CAAE;AACF;;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/api/team.js.map

@@ -1 +1 @@
-{"version":3,"file":"team.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"team.js","sources":["api/team.js"],"sourcesContent":["import request from '@/utils/request.js'; // 引入封装的方法\r\n\r\n\r\n// 查询团队业绩\r\nexport function getPerformance(data) {\r\n\t// return request.post('/common/getSmsCode',qs.stringify(params));\r\n\treturn request({\r\n\t    url: \"/teamsumm/getPerformance\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n// 查询团队概况\r\nexport function getJuniorSummary(data) {\r\n\t// return request.post('/common/getSmsCode',qs.stringify(params));\r\n\treturn request({\r\n\t    url: \"/teamsumm/getJuniorSummary\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n// 查询团队概况\r\nexport function getCascadeJunior(data) {\r\n\t// return request.post('/common/getSmsCode',qs.stringify(params));\r\n\treturn request({\r\n\t    url: \"/teamsumm/getCascadeJunior\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n// 查询账户类型\r\nexport function getAcctCategory(data) {\r\n\treturn request({\r\n\t    url: \"/teamsumm/getAcctCategory\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n\r\n// 查询提成概况\r\nexport function getRewardSummary(data) {\r\n\treturn request({\r\n\t    url: \"/teamsumm/getRewardSummary\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}\r\n\r\n// 查询提成记录\r\nexport function getRewardSummaryRecord(data) {\r\n\treturn request({\r\n\t    url: \"/teamsumm/getRewardSummaryRecord\",\r\n\t    method: \"get\",\r\n\t    data,\r\n\t});\r\n}"],"names":["request"],"mappings":";;AAIO,SAAS,eAAe,MAAM;AAEpC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAGO,SAAS,iBAAiB,MAAM;AAEtC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAGO,SAAS,iBAAiB,MAAM;AAEtC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAGO,SAAS,gBAAgB,MAAM;AACrC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAIO,SAAS,iBAAiB,MAAM;AACtC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;AAGO,SAAS,uBAAuB,MAAM;AAC5C,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACL,CAAE;AACF;;;;;;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"app.js","sources":["App.vue","main.js"],"sourcesContent":["<script>\r\n  export default {\r\n    onLaunch: function() {\r\n      console.log('App Launch')\r\n\t  const res = uni.getSystemInfoSync();\r\n\t  uni.setStorageSync('platform', res.platform);\r\n\t  // #ifdef APP-PLUS　　　　　　　　　\r\n\t  // 获取应用版本信息\r\n\t  plus.runtime.getProperty(plus.runtime.appid, function(inf) {\r\n\t  \tuni.setStorageSync('version', inf.version); // 大版本号\r\n\t  \tuni.setStorageSync('versionCode', inf.versionCode); // 小版本号\r\n\t  });\r\n\t  let uuid = plus.device.uuid;\r\n\t  // #endif\r\n    },\r\n    onShow: function() {\r\n      console.log('App Show')\r\n\t  // 隐藏原生tabbar\r\n\t  /*#ifdef APP-PLUS*/\r\n\t    uni.hideTabBar({\r\n\t    \tanimation: false\r\n\t    })\r\n\t  /*#endif*/\r\n    },\r\n    onHide: function() {\r\n      console.log('App Hide')\r\n    }\r\n  }\r\n</script>\r\n\r\n<style lang=\"scss\">\r\n\t@import \"@/uni_modules/uview-plus/index.scss\";\r\n\t@import '@/uni.scss';\r\n\t@import '@/common.scss';\r\n\t\r\n  .container {\r\n    padding: 15px;\r\n  }\r\n\r\n  button {\r\n    margin-bottom: 15px;\r\n  }\r\n  img {\r\n    width: 100%;\r\n    height: auto; /* 保持图片比例 */\r\n  }\r\n</style>\r\n","import App from './App'\nimport messages from './locale/index'\r\nimport uviewPlus from '@/uni_modules/uview-plus'\r\n\nlet i18nConfig = {\n  locale: uni.getLocale(),\n  messages\n}\n\n// #ifndef VUE3\nimport Vue from 'vue'\nimport VueI18n from 'vue-i18n'\r\n\r\nimport 'uview-plus/lib/style/index.scss' // 引入uView的样式\r\n\nVue.use(VueI18n)\nconst i18n = new VueI18n(i18nConfig)\nVue.config.productionTip = false\nApp.mpType = 'app'\nconst app = new Vue({\n  i18n,\n  ...App\n})\napp.$mount()\n// #endif\n\n// #ifdef VUE3\nimport { createSSRApp } from 'vue'\nimport { createI18n } from 'vue-i18n'\nconst i18n = createI18n(i18nConfig)\nexport function createApp() {\n  const app = createSSRApp(App)\n  app.use(i18n)\r\n  app.use(uviewPlus)\r\n  return {\n    app\n  }\n}\n// #endif\r\n"],"names":["uni","messages","createI18n","createSSRApp","App","uviewPlus"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACE,MAAK,YAAU;AAAA,EACb,UAAU,WAAW;AACnBA,kBAAAA,MAAA,MAAA,OAAA,gBAAY,YAAY;AAC3B,UAAM,MAAMA,oBAAI;AAChBA,kBAAAA,MAAI,eAAe,YAAY,IAAI,QAAQ;AAAA,EASzC;AAAA,EACD,QAAQ,WAAW;AACjBA,kBAAAA,oCAAY,UAAU;AAAA,EAOvB;AAAA,EACD,QAAQ,WAAW;AACjBA,kBAAAA,oCAAY,UAAU;AAAA,EACxB;AACF;ACvBF,IAAI,aAAa;AAAA,EACf,QAAQA,cAAG,MAAC,UAAW;AAAA,EACzB,UAAEC,aAAQ;AACV;AAsBA,MAAM,OAAOC,cAAU,WAAC,UAAU;AAC3B,SAAS,YAAY;AAC1B,QAAM,MAAMC,cAAY,aAACC,SAAG;AAC5B,MAAI,IAAI,IAAI;AACZ,MAAI,IAAIC,qCAAS;AACjB,SAAO;AAAA,IACL;AAAA,EACD;AACH;;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/components/address.js.map

@@ -1 +1 @@
-{"version":3,"file":"address.js","sources":["D:/Tool/HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RTovUHJvamVjdC9WdWUvdW5pYXBwL2hhc2htYWxsLWFwcC9jb21wb25lbnRzL2FkZHJlc3MudnVl"],"sourcesContent":["import Component from 'E:/Project/Vue/uniapp/hashmall-app/components/address.vue'\nwx.createComponent(Component)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,gBAAgB,SAAS;"}
+{"version":3,"file":"address.js","sources":["components/address.vue","D:/Tool/HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RTovUHJvamVjdC9WdWUvdW5pYXBwL2hhc2htYWxsLWFwcC9jb21wb25lbnRzL2FkZHJlc3MudnVl"],"sourcesContent":["<template>\n\t<view class=\"mine_address_warp\">\n\t\t<view \r\n\t\t\tv-for=\"item in addressList\" \r\n\t\t\t:key=\"item.id\" \r\n\t\t\t:class=\"selectAddress && selectAddress.id === item.id?'address_item address_item_sel':'address_item'\" \r\n\t\t\tv-if=\"addressList && addressList.length !==0\"\r\n\t\t\t@click=\"checkAddress(item)\"\r\n\t\t>\r\n\t\t\t<view class=\"address_item_country_name\">\r\n\t\t\t\t{{item.countryName}} {{item.provinceName}} {{item.cityName}} {{item.areaName}} \r\n\t\t\t</view>\r\n\t\t\t<view class=\"address_item_address\">\r\n\t\t\t\t{{item.address}} \r\n\t\t\t</view>\r\n\t\t\t<view class=\"address_item_info\">\r\n\t\t\t\t<view>{{item.name}}</view>\r\n\t\t\t\t<view style=\"margin-left: 20rpx;\">{{item.phone}}</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\t\t<view v-else class=\"not_order_warp\">\r\n\t\t\t<view class=\"not_order_warp_img\"><up-image src=\"/static/common/not_search.png\" width=\"100\" height=\"100\" bgColor=\"#f1f6ff00\"></up-image></view>\r\n\t\t\t<view class=\"not_order_msg_warp\">暂时地址，快去地址管理添加吧~</view>\r\n\t\t</view>\r\n\t</view>\n</template>\n\n<script>\r\n\timport { getAddress,setAddressDefault,deleteAddress } from '@/api/address.js';\r\n\t\n\texport default {\n\t\tdata() {\n\t\t\treturn {\n\t\t\t\taddressList:[],\r\n\t\t\t\tselectAddress:{},\n\t\t\t}\n\t\t},\r\n\t\tmounted() {\r\n\t\t\tthis.getAddressList();\r\n\t\t},\n\t\tmethods: {\r\n\t\t\t// 添加地址\r\n\t\t\tjumpAddAddress(){\r\n\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\turl:'/pages/mine_address_add/mine_address_add',\r\n\t\t\t\t})\r\n\t\t\t},\r\n\t\t\t// 查询地址\r\n\t\t\tasync getAddressList(){\r\n\t\t\t\tconst res = await getAddress();\r\n\t\t\t\tif(res && res.bizcode === 100){\r\n\t\t\t\t\tthis.addressList = res.data;\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\tcheckAddress(item){\r\n\t\t\t\tthis.selectAddress = item;\r\n\t\t\t\tthis.$emit(\"valueFunc\", item);\r\n\t\t\t},\r\n\t\t}\n\t}\n</script>\n\n<style lang=\"scss\" scoped>\r\n\t\n\t.mine_address_warp{\r\n\t}\r\n\t.address_item{\r\n\t\tbackground: #FFFFFF;\r\n\t\tpadding: 30rpx;\r\n\t\tborder-bottom: 1rpx solid #9e9e9e26;\r\n\t}\r\n\t.address_item_sel{\r\n\t\tcolor: $app-bt-bj !important;\r\n\t\tbackground-color: #ff57220d;\r\n\t}\r\n\t.address_item_info{\r\n\t\tfont-size: 26rpx;\r\n\t\tcolor: #868383;\r\n\t\tdisplay: flex;\r\n\t}\r\n\t.address_item_address{\r\n\t\tfont-weight: bold;\r\n\t\tfont-size: 32rpx;\r\n\t\tcolor: #666666;\r\n\t\tmargin: 10rpx 0;\r\n\t}\r\n\t.address_item_country_name{\r\n\t\tcolor: #9E9E9E;\r\n\t\tfont-size: 22rpx;\r\n\t}\r\n</style>\n","import Component from 'E:/Project/Vue/uniapp/hashmall-app/components/address.vue'\nwx.createComponent(Component)"],"names":["uni","getAddress"],"mappings":";;;AA8BC,MAAK,YAAU;AAAA,EACd,OAAO;AACN,WAAO;AAAA,MACN,aAAY,CAAE;AAAA,MACd,eAAc,CAAE;AAAA,IACjB;AAAA,EACA;AAAA,EACD,UAAU;AACT,SAAK,eAAc;AAAA,EACnB;AAAA,EACD,SAAS;AAAA;AAAA,IAER,iBAAgB;AACfA,oBAAAA,MAAI,WAAW;AAAA,QACd,KAAI;AAAA,OACJ;AAAA,IACD;AAAA;AAAA,IAED,MAAM,iBAAgB;AACrB,YAAM,MAAM,MAAMC,YAAAA;AAClB,UAAG,OAAO,IAAI,YAAY,KAAI;AAC7B,aAAK,cAAc,IAAI;AAAA,MACxB;AAAA,IACA;AAAA,IACD,aAAa,MAAK;AACjB,WAAK,gBAAgB;AACrB,WAAK,MAAM,aAAa,IAAI;AAAA,IAC5B;AAAA,EACF;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC1DD,GAAG,gBAAgB,SAAS;"}

unpackage/dist/dev/.sourcemap/mp-weixin/components/choiceness/choiceness.js.map

@@ -1 +1 @@
-{"version":3,"file":"choiceness.js","sources":["D:/Tool/HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RTovUHJvamVjdC9WdWUvdW5pYXBwL2hhc2htYWxsLWFwcC9jb21wb25lbnRzL2Nob2ljZW5lc3MvY2hvaWNlbmVzcy52dWU"],"sourcesContent":["import Component from 'E:/Project/Vue/uniapp/hashmall-app/components/choiceness/choiceness.vue'\nwx.createComponent(Component)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,gBAAgB,SAAS;"}
+{"version":3,"file":"choiceness.js","sources":["components/choiceness/choiceness.vue","D:/Tool/HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RTovUHJvamVjdC9WdWUvdW5pYXBwL2hhc2htYWxsLWFwcC9jb21wb25lbnRzL2Nob2ljZW5lc3MvY2hvaWNlbmVzcy52dWU"],"sourcesContent":["<template>\r\n\t<view class=\"choiceness_warp\">\r\n\t\t<view class=\"choiceness_title\">\r\n\t\t\t<up-image src=\"/static/common/jingxuan_left.png\" width=\"24\" height=\"8\" bgColor=\"#f1f6ff00\"></up-image>\r\n\t\t\t<view class=\"choiceness_title_msg\">为您精选</view>\r\n\t\t\t<up-image src=\"/static/common/jingxuan_right.png\" width=\"24\" height=\"8\" bgColor=\"#f1f6ff00\"></up-image>\r\n\t\t</view>\r\n\t\t<view class=\"choiceness_product\">\r\n\t\t\t<view v-for=\"item in productList\" :key=\"item.id\" class=\"choiceness_product_item\" @click=\"jumpInfo(item)\">\r\n\t\t\t\t<up-image :src=\"item.url\" width=\"100%\" height=\"140\" bgColor=\"#f1f6ff00\"></up-image>\r\n\t\t\t\t<view class=\"product_item_name\">{{item.title}}</view>\r\n\t\t\t\t<view class=\"product_item_price\">\r\n\t\t\t\t\t<view class=\"price_\">\r\n\t\t\t\t\t\t<text>￥</text>\r\n\t\t\t\t\t\t<text style=\"color:36rpx;\">{{item.adPrice}}</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"price_sell\">已售{{item.sales}}件</view>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\t</view>\r\n</template>\r\n\r\n<script>\r\n\timport { searchList } from '@/api/product.js';\r\n\t\r\n\texport default {\r\n\t\tname:\"choiceness\",\r\n\t\tdata() {\r\n\t\t\treturn {\r\n\t\t\t\tproductList:[]\r\n\t\t\t};\r\n\t\t},\r\n\t\tmounted() {\r\n\t\t\tthis.getSearchList();\r\n\t\t},\r\n\t\tmethods: {\r\n\t\t\t// \r\n\t\t\tjumpInfo(item){\r\n\t\t\t\tuni.navigateTo({\r\n\t\t\t\t    url: '/pages/productInfo/productInfo?id='+item.id,\r\n\t\t\t\t})\r\n\t\t\t},\r\n\t\t\tasync getSearchList(){\r\n\t\t\t\tconst params={\r\n\t\t\t\t\tisRecomm:true,\r\n\t\t\t\t\tpage:1,\r\n\t\t\t\t\tpageSize:66,\r\n\t\t\t\t}\r\n\t\t\t\tconst resp = await searchList(params);\r\n\t\t\t\tif(resp && resp.bizcode === 100){\r\n\t\t\t\t\tthis.productList = resp.data\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\" scoped>\r\n\t.choiceness_warp{\r\n\t\tmargin-top: 50rpx;\r\n\t}\r\n\t.choiceness_title{\r\n\t\tdisplay: flex;\r\n\t\tjustify-content: center;\r\n\t\t.choiceness_title_msg{\r\n\t\t\tmargin: 0 18rpx;\r\n\t\t}\r\n\t}\r\n\t.choiceness_product{\r\n\t\tmargin-top: 40rpx;\r\n\t\tdisplay: flex;\r\n\t\tflex-wrap: wrap;\r\n\t\tjustify-content: space-between;\r\n\t\t.choiceness_product_item{\r\n\t\t\tbackground: #FFFFFF;\r\n\t\t\tbox-shadow: 0rpx 0rpx 10rpx 0rpx #EEEEEE;\r\n\t\t\tborder-radius: 24rpx;\r\n\t\t\twidth: 43%;\r\n\t\t\tmargin-bottom: 20rpx;\r\n\t\t\tpadding: 20rpx;\r\n\t\t}\r\n\t\t.product_item_name{\r\n\t\t\tfont-weight: bold;\r\n\t\t\tfont-size: 26rpx;\r\n\t\t\tcolor: #333333;\r\n\t\t\tmargin-top: 20rpx;\r\n\t\t}\r\n\t\t.product_item_price{\r\n\t\t\tdisplay: flex;\r\n\t\t\tjustify-content: space-between;\r\n\t\t\talign-items: center;\r\n\t\t\tmargin-top: 10rpx;\r\n\t\t\t.price_{\r\n\t\t\t\tfont-weight: bold;\r\n\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\tcolor: $app-bt-bj;\r\n\t\t\t}\r\n\t\t\t.price_sell{\r\n\t\t\t\tfont-weight: 400;\r\n\t\t\t\tfont-size: 18rpx;\r\n\t\t\t\tcolor: #999999;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n</style>","import Component from 'E:/Project/Vue/uniapp/hashmall-app/components/choiceness/choiceness.vue'\nwx.createComponent(Component)"],"names":["uni","searchList"],"mappings":";;;AA0BC,MAAK,YAAU;AAAA,EACd,MAAK;AAAA,EACL,OAAO;AACN,WAAO;AAAA,MACN,aAAY,CAAC;AAAA;EAEd;AAAA,EACD,UAAU;AACT,SAAK,cAAa;AAAA,EAClB;AAAA,EACD,SAAS;AAAA;AAAA,IAER,SAAS,MAAK;AACbA,oBAAAA,MAAI,WAAW;AAAA,QACX,KAAK,uCAAqC,KAAK;AAAA,OAClD;AAAA,IACD;AAAA,IACD,MAAM,gBAAe;AACpB,YAAM,SAAO;AAAA,QACZ,UAAS;AAAA,QACT,MAAK;AAAA,QACL,UAAS;AAAA,MACV;AACA,YAAM,OAAO,MAAMC,uBAAW,MAAM;AACpC,UAAG,QAAQ,KAAK,YAAY,KAAI;AAC/B,aAAK,cAAc,KAAK;AAAA,MACzB;AAAA,IACD;AAAA,EACD;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACtDD,GAAG,gBAAgB,SAAS;"}

unpackage/dist/dev/.sourcemap/mp-weixin/components/code-comm/code-comm.js.map

@@ -1 +1 @@
-{"version":3,"file":"code-comm.js","sources":["D:/Tool/HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RTovUHJvamVjdC9WdWUvdW5pYXBwL2hhc2htYWxsLWFwcC9jb21wb25lbnRzL2NvZGUtY29tbS9jb2RlLWNvbW0udnVl"],"sourcesContent":["import Component from 'E:/Project/Vue/uniapp/hashmall-app/components/code-comm/code-comm.vue'\nwx.createComponent(Component)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,gBAAgB,SAAS;"}
+{"version":3,"file":"code-comm.js","sources":["components/code-comm/code-comm.vue","D:/Tool/HBuilderX/plugins/uniapp-cli-vite/uniComponent:/RTovUHJvamVjdC9WdWUvdW5pYXBwL2hhc2htYWxsLWFwcC9jb21wb25lbnRzL2NvZGUtY29tbS9jb2RlLWNvbW0udnVl"],"sourcesContent":["<template>\r\n\t<view class=\"comm-input-warp\">\r\n\t\t<!-- #ifdef APP-PLUS -->\r\n\t\t\t<input\r\n\t\t\t    :placeholder=\"$t('login.comm.code')\"\r\n\t\t\t    border=\"false\"\r\n\t\t\t    :v-model=\"modelValue\"\r\n\t\t\t\tcolor=\"#EEEEEE\"\r\n\t\t\t\ttype=\"number\"\r\n\t\t\t\t@input=\"$emit('update:modelValue', $event.detail.value)\"\r\n\t\t\t\tstyle=\"height: 64rpx;width: 70%;\"\r\n\t\t\t></input>\r\n\t\t<!-- #endif -->\r\n\t\t<!-- #ifdef MP -->\r\n\t\t\t<input\r\n\t\t\t    :placeholder=\"$t('login.comm.code')\"\r\n\t\t\t    border=\"false\"\r\n\t\t\t    :v-model=\"modelValue\"\r\n\t\t\t\tcolor=\"#EEEEEE\"\r\n\t\t\t\ttype=\"number\"\r\n\t\t\t\t@input=\"$emit('update:modelValue', $event.target.value)\"\r\n\t\t\t\tstyle=\"height: 64rpx;width: 70%;\"\r\n\t\t\t></input>\r\n\t\t<!-- #endif -->\r\n\t\t<view class=\"code-warp\" v-if=\"countdown\">\r\n\t\t\t<up-count-down :time=\"60 * 1000\" format=\"ss\" @finish=\"getCode(false)\"></up-count-down> \r\n\t\t\t<text style=\"margin-left: 10rpx;\">s</text>\r\n\t\t\t<!-- <text style=\"margin-left: 10rpx;\">{{$t('login.comm.reacquire.code')}}</text> -->\r\n\t\t</view>\r\n\t\t<view v-else class=\"code-warp\" @click=\"getCode(true)\">\r\n\t\t\t<view>{{$t('login.comm.get.code')}}</view>\r\n\t\t</view>\r\n\t\t<up-toast ref=\"uToastRef\"></up-toast>\r\n\t</view>\r\n</template>\n\n<script>\r\n\timport { ref } from 'vue';\r\n\t\r\n\tconst uCodeRef = ref(null);\r\n\t\r\n\texport default {\r\n\t\tname: 'inputComm',\n\t\tprops: ['modelValue','codeNumberRef','emptyCountdownRef'],\r\n\t\twatch: {\r\n\t\t    emptyCountdownRef(value,oldValue) {\r\n\t\t\t\tif(value){\r\n\t\t\t\t\tthis.countdown = true;\r\n\t\t\t\t}\r\n\t\t    },\r\n\t\t},\r\n\t\tdata() {\r\n\t\t\treturn {\r\n\t\t\t\tcountdown:false,\r\n\t\t\t\temptyCountdown:this.emptyCountdownRef,\r\n\t\t\t\tinputCss:{\r\n\t\t\t\t\t\"height\":'80rpx',\r\n\t\t\t\t\t\"background\": \"#F3F3F3FF\",\r\n\t\t\t\t\t\"border-radius\": \"30rpx\",\r\n\t\t\t\t\t\"border\": \"0rpx\",\r\n\t\t\t\t\t\"padding-left\": \"16px\",\r\n\t\t\t\t},\r\n\t\t\t}\r\n\t\t},\r\n\t\temits: ['update:modelValue'],\r\n\t\tmounted() {\r\n\t\t},\r\n\t\tmethods: {\r\n\t\t\tgetCode(val){\r\n\t\t\t\tconst emptyCountdown = this.emptyCountdown;\r\n\t\t\t\tif(val){\r\n\t\t\t\t\tconst codeNumber = this.codeNumberRef;\r\n\t\t\t\t\tif(codeNumber){\r\n\t\t\t\t\t\tthis.$emit('getCode');\r\n\t\t\t\t\t}else{\r\n\t\t\t\t\t\tthis.$refs.uToastRef.show({\r\n\t\t\t\t\t\t\ttype: 'error',\r\n\t\t\t\t\t\t\tmessage: this.$t('login.comm.email'),\r\n\t\t\t\t\t\t});\r\n\t\t\t\t\t\treturn;\r\n\t\t\t\t\t}\r\n\t\t\t\t}else{\r\n\t\t\t\t\t// uni.dialog.showMessage('请输入邮箱');\r\n\t\t\t\t\tthis.$refs.uToastRef.show({\r\n\t\t\t\t\t\ttype: 'error',\r\n\t\t\t\t\t\tmessage: this.$t('login.comm.email'),\r\n\t\t\t\t\t});\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t},\n\t};\r\n\n</script>\n\n<style lang=\"less\" scoped>\r\n\t.code-warp{\r\n\t\twidth: 30%;\r\n\t\ttext-align: right;\r\n\t\tdisplay: flex;\r\n\t\tjustify-content: flex-end;\r\n\t}\r\n\t.wrap {\r\n\t\tpadding: 24rpx;\r\n\t}\r\n</style>","import Component from 'E:/Project/Vue/uniapp/hashmall-app/components/code-comm/code-comm.vue'\nwx.createComponent(Component)"],"names":["ref"],"mappings":";;AAuCkBA,cAAG,IAAC,IAAI;AAEzB,MAAK,YAAU;AAAA,EACd,MAAM;AAAA,EACN,OAAO,CAAC,cAAa,iBAAgB,mBAAmB;AAAA,EACxD,OAAO;AAAA,IACH,kBAAkB,OAAM,UAAU;AACpC,UAAG,OAAM;AACR,aAAK,YAAY;AAAA,MAClB;AAAA,IACG;AAAA,EACJ;AAAA,EACD,OAAO;AACN,WAAO;AAAA,MACN,WAAU;AAAA,MACV,gBAAe,KAAK;AAAA,MACpB,UAAS;AAAA,QACR,UAAS;AAAA,QACT,cAAc;AAAA,QACd,iBAAiB;AAAA,QACjB,UAAU;AAAA,QACV,gBAAgB;AAAA,MAChB;AAAA,IACF;AAAA,EACA;AAAA,EACD,OAAO,CAAC,mBAAmB;AAAA,EAC3B,UAAU;AAAA,EACT;AAAA,EACD,SAAS;AAAA,IACR,QAAQ,KAAI;AACY,WAAK;AAC5B,UAAG,KAAI;AACN,cAAM,aAAa,KAAK;AACxB,YAAG,YAAW;AACb,eAAK,MAAM,SAAS;AAAA,eAChB;AACJ,eAAK,MAAM,UAAU,KAAK;AAAA,YACzB,MAAM;AAAA,YACN,SAAS,KAAK,GAAG,kBAAkB;AAAA,UACpC,CAAC;AACD;AAAA,QACD;AAAA,aACI;AAEJ,aAAK,MAAM,UAAU,KAAK;AAAA,UACzB,MAAM;AAAA,UACN,SAAS,KAAK,GAAG,kBAAkB;AAAA,QACpC,CAAC;AAAA,MACF;AAAA,IACA;AAAA,EACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACxFH,GAAG,gBAAgB,SAAS;"}