feat:提交代码，基本完成电影模块的对接

.env.development

@@ -1,2 +1,3 @@
 VITE_GLOB_API_URL = 'https://testapi.hxxfb.com'
 
+

pages.config.ts

@@ -16,12 +16,14 @@ export default defineUniPages({
 			iconPath: 'static/icon/home-off.png',
 			selectedIconPath: 'static/icon/home-on.png',
 			text: '首页'
-		}, {
-			pagePath: 'pages/store/nearby/index',
-			iconPath: 'static/icon/dacang-off.png',
-			selectedIconPath: 'static/icon/dacang-on.png',
-			text: '本地生活'
-		}, {
+		},
+		// {
+		// 	pagePath: 'pages/store/nearby/index',
+		// 	iconPath: 'static/icon/dacang-off.png',
+		// 	selectedIconPath: 'static/icon/dacang-on.png',
+		// 	text: '本地生活'
+		// }, 
+		{
 			pagePath: 'pages/dacang/list/index',
 			iconPath: 'static/icon/chuangke-off.png',
 			selectedIconPath: 'static/icon/chuangke-on.png',

src/apis/common.ts

@@ -1,11 +1,11 @@
-import {defHttp} from '~/utils/http'
-import {USER_LATITUDE, USER_LONGITUDE} from "~/constants";
+import { defHttp } from '~/utils/http'
+import { USER_LATITUDE, USER_LONGITUDE, USER_CHOOSE_CITY } from "~/constants";
 import AmapWx from "~/libs/amap-wx";
-import type {ArticleCategoryModel, ArticleModel, ArticleResult} from "~/apis/model/articleModel";
-import type {HomeQuickLinkModel} from "~/apis/model/common.model";
-import type {IntegralProductModel, IntegralProductParams} from "~/apis/model/integral.model";
-import type {AnnouncementResult} from "~/apis/model/announcement.model";
-import type {FeedbackRequestModel} from "~/apis/model/feedback.model";
+import type { ArticleCategoryModel, ArticleModel, ArticleResult } from "~/apis/model/articleModel";
+import type { HomeQuickLinkModel } from "~/apis/model/common.model";
+import type { IntegralProductModel, IntegralProductParams } from "~/apis/model/integral.model";
+import type { AnnouncementResult } from "~/apis/model/announcement.model";
+import type { FeedbackRequestModel } from "~/apis/model/feedback.model";
 // import {a} from "unocss-preset-weapp/dist/utilities-46c43da7";
 // 引入
 // import amap from '~/libs/amap-wx.130.js';
@@ -13,190 +13,212 @@ import type {FeedbackRequestModel} from "~/apis/model/feedback.model";
 // let amapPlugin = new amap.AMapWX({
 //     key: "e42681aed12886436ed44d6c28aa22c8"
 // });
-const amap = AmapWx.getInstance({key: "e42681aed12886436ed44d6c28aa22c8"});
+const amap = AmapWx.getInstance({ key: "e42681aed12886436ed44d6c28aa22c8" });
 
 enum API {
 
-    /**
-     * // 获取北参堂icon和title
-     * 首页金刚区
-     */
-    HOME_QUICK_LINK = `/api/common/home_quick_link`,
-    // 积分通兑产品
-    ENTROPY_PRODUCT_LIST = '/api/entropy/product_lst',
-    // 帮助中心分类
-    ARTICLE_CATEGORY_LIST = '/api/article/category/lst/19',
-    // 文章列表
-    ARTICLE_LIST = '/api/article/lst',
-    // 文章详情
-    ARTICLE_DETAIL = '/api/article/detail',
-
-    // 系统公告
-    NOTICE_LIST = '/api/notice/list',
-
-    // 注销接口
-    USER_LOGOUT = '/gateway/userCenter_service/userCenterService/userLogout',
-
-    // 上传图片
-    UPLOAD_IMAGE_FIELD = '/api/upload/image/field',
-    // 意见反馈-类型
-    FEEDBACK_TYPE_NEW = '/api/common/feedback_type_new',
-    // 意见反馈提交
-    FEEDBACK = '/api/user/feedback',
-    // 获取热门搜索关键词
-    HOT_KEYWORD = '/api/common/hot_keyword',
-
-    HOME_BANNER = '/api/newhome/nologin/banner/home_banner_new',
+	/**
+	 * // 获取北参堂icon和title
+	 * 首页金刚区
+	 */
+	HOME_QUICK_LINK = `/api/common/home_quick_link`,
+	// 积分通兑产品
+	ENTROPY_PRODUCT_LIST = '/api/entropy/product_lst',
+	// 帮助中心分类
+	ARTICLE_CATEGORY_LIST = '/api/article/category/lst/19',
+	// 文章列表
+	ARTICLE_LIST = '/api/article/lst',
+	// 文章详情
+	ARTICLE_DETAIL = '/api/article/detail',
+
+	// 系统公告
+	NOTICE_LIST = '/api/notice/list',
+
+	// 注销接口
+	USER_LOGOUT = '/gateway/userCenter_service/userCenterService/userLogout',
+
+	// 上传图片
+	UPLOAD_IMAGE_FIELD = '/api/upload/image/field',
+	// 意见反馈-类型
+	FEEDBACK_TYPE_NEW = '/api/common/feedback_type_new',
+	// 意见反馈提交
+	FEEDBACK = '/api/user/feedback',
+	// 获取热门搜索关键词
+	HOT_KEYWORD = '/api/common/hot_keyword',
+
+	HOME_BANNER = '/api/newhome/nologin/banner/home_banner_new',
 	BANNER = '/api/newhome/nologin/banner/',
 
-    GET_PRODUCT_SHARE = '/api/get_product_share',
-    // /api/get_product_share
+	GET_PRODUCT_SHARE = '/api/get_product_share',
+	// /api/get_product_share
 }
 
 export function getProductShare() {
-    return defHttp.get({
-        url: API.GET_PRODUCT_SHARE
-    })
+	return defHttp.get({
+		url: API.GET_PRODUCT_SHARE
+	})
 }
 
 /**
  * 获取首页轮播图
  */
-export function getHomeBanner(type="home_banner_new") {
-    return defHttp.get({
-        url: API.BANNER+type,
-    })
+export function getHomeBanner(type = "home_banner_new") {
+	return defHttp.get({
+		url: API.BANNER + type,
+	})
 }
 
 // 获取热门搜索关键ygnk
 export function getHotkeyWord() {
-    return defHttp.get({
-        url: API.HOT_KEYWORD,
-    })
+	return defHttp.get({
+		url: API.HOT_KEYWORD,
+	})
 }
 /**
  * 添加反馈
  * @param params
  */
-export function createFeedback(params: FeedbackRequestModel) {
-    return defHttp.post({
-        url: API.FEEDBACK,
-        data: {
-            ...params
-        }
-    })
+export function createFeedback(params : FeedbackRequestModel) {
+	return defHttp.post({
+		url: API.FEEDBACK,
+		data: {
+			...params
+		}
+	})
 }
 export function getFeedbackType() {
-    return defHttp.get({
-        url: API.FEEDBACK_TYPE_NEW,
-    })
+	return defHttp.get({
+		url: API.FEEDBACK_TYPE_NEW,
+	})
 }
 /**
  * 注销账号
  * @param phone
  */
-export function closeAccount(phone: string) {
-
-    return defHttp.post({
-        url: API.USER_LOGOUT,
-        data: {
-            phone
-        }
-    }, {
-        withToken: false
-    })
+export function closeAccount(phone : string) {
+
+	return defHttp.post({
+		url: API.USER_LOGOUT,
+		data: {
+			phone
+		}
+	}, {
+		withToken: false
+	})
 }
 
 export function getLocal() {
-    uni.getLocation({
-        type: 'wgs84',
-        success(res) {
-            console.log('location', res)
-            uni.setStorageSync(USER_LATITUDE, res.latitude)
-            uni.setStorageSync(USER_LONGITUDE, res.longitude)
-            // getRegeo(res.latitude, res.longitude);
-        }
-    })
-
-    // uni.showModal({
-    //     title: '提示',
-    //     content: '为了您更好的体验，请同意授权位置',
-    //     success: (res) => {
-    //         if (res.confirm) {
-    //             uni.getLocation({
-    //                 type: 'wgs84',
-    //                 success(res) {
-    //                     console.log(res)
-    //                     uni.setStorageSync(USER_LATITUDE, res.latitude)
-    //                     uni.setStorageSync(USER_LONGITUDE, res.longitude)
-    //                     // getRegeo(res.latitude, res.longitude);
-    //                 }
-    //             })
-    //             // amap.getWxLocation(async (loc) => {
-    //                 // 获取地址描述数据
-    //                 // const regeoRes = await amap.getRegeo({location: loc});
-    //                 // console.log(regeoRes.data.regeocode.addressComponent)
-    //             // })
-    //         }
-    //     }
-    // })
-}
-
-export async function getRegeo(latitude: number, longitude: number) {
-    // amapPlugin.getRegeo
-    const regeoRes = await amap.getRegeo({
-        location: '' + longitude + ',' + latitude + '',
-    })
-    // console.log(regeoRes.data.regeocode.addressComponent.city)
+	uni.getLocation({
+		type: 'wgs84',
+		success(res) {
+			console.log('location', res)
+			uni.setStorageSync(USER_LATITUDE, res.latitude)
+			uni.setStorageSync(USER_LONGITUDE, res.longitude)
+			// getRegeo(res.latitude, res.longitude);
+			console.log("===getLocal111");
+		}
+	})
+
 }
 
+export async function getRegeoX(callBack : Function) {
+	let latitude = uni.getStorageSync(USER_LATITUDE)
+	let longitude = uni.getStorageSync(USER_LONGITUDE)
+	const regeoRes = await amap.getRegeo({
+		location: '' + longitude + ',' + latitude + '',
+	})
+	//console.log("===regeoRes",regeoRes);
+	callBack && callBack(regeoRes.data.regeocode.addressComponent.city)
+	uni.setStorageSync(USER_CHOOSE_CITY, regeoRes.data.regeocode.addressComponent.city)
+}
+
+export function getLocalX(callBack : Function) {
+	uni.getLocation({
+		type: 'wgs84',
+		success(res) {
+			uni.setStorageSync(USER_LATITUDE, res.latitude)
+			uni.setStorageSync(USER_LONGITUDE, res.longitude)
+			callBack && callBack(res.latitude)
+		},
+		fail: () => {
+			callBack && callBack('')
+		}
+	})
+
+}
+
+
+
+
+export async function getRegeo(latitude : number, longitude : number) {
+	// amapPlugin.getRegeo
+	const regeoRes = await amap.getRegeo({
+		location: '' + longitude + ',' + latitude + '',
+	})
+	uni.setStorageSync(USER_CHOOSE_CITY, regeoRes.data.regeocode.addressComponent.city)
+	console.log(regeoRes.data.regeocode.addressComponent.city)
+
+}
+export async function getLongitudeAndLatitude(city : string) {
+	// amapPlugin.getRegeo
+	const _info = await amap.getLongitudeAndLatitude({
+		address: city,
+	})
+	uni.setStorageSync(USER_LONGITUDE, _info.data.geocodes[0].location.split(',')[0])
+	uni.setStorageSync(USER_LATITUDE, _info.data.geocodes[0].location.split(',')[1])
+	console.log("getLongitudeAndLatitude==", _info)
+
+}
+
+
+
 /**
  * 获取积分通兑产品列表
  */
-export function getEntropyProductList(params: IntegralProductParams): Promise<Array<IntegralProductModel>> {
-    return defHttp.get({
-        url: API.ENTROPY_PRODUCT_LIST,
-        data: {
-            ...params
-        }
-    })
+export function getEntropyProductList(params : IntegralProductParams) : Promise<Array<IntegralProductModel>> {
+	return defHttp.get({
+		url: API.ENTROPY_PRODUCT_LIST,
+		data: {
+			...params
+		}
+	})
 }
 
 /**
  * 获取帮助中心分类
  */
-export function getArticleCategory(): Promise<ArticleCategoryModel[]> {
-    return defHttp.get({
-        url: API.ARTICLE_CATEGORY_LIST,
-    }, {withToken: false})
+export function getArticleCategory() : Promise<ArticleCategoryModel[]> {
+	return defHttp.get({
+		url: API.ARTICLE_CATEGORY_LIST,
+	}, { withToken: false })
 }
 
 /**
  * 文章列表
  */
-export function getArticleList(article_category_id: string): Promise<ArticleResult> {
-    return defHttp.get({
-        url: `${API.ARTICLE_LIST}/${article_category_id}`,
-    }, {withToken: false})
+export function getArticleList(article_category_id : string) : Promise<ArticleResult> {
+	return defHttp.get({
+		url: `${API.ARTICLE_LIST}/${article_category_id}`,
+	}, { withToken: false })
 }
 
-export function getArticleDetail(article_id: string): Promise<ArticleModel> {
-    return defHttp.get({
-        url: `${API.ARTICLE_DETAIL}/${article_id}`,
-    }, {withToken: false})
+export function getArticleDetail(article_id : string) : Promise<ArticleModel> {
+	return defHttp.get({
+		url: `${API.ARTICLE_DETAIL}/${article_id}`,
+	}, { withToken: false })
 }
 
 /**
  * 首页金刚区
  */
-export function getHomeQuickLink(): Promise<Array<HomeQuickLinkModel>> {
-    return defHttp.get({
-        url: `${API.HOME_QUICK_LINK}`
-    })
+export function getHomeQuickLink() : Promise<Array<HomeQuickLinkModel>> {
+	return defHttp.get({
+		url: `${API.HOME_QUICK_LINK}`
+	})
 }
 
-export function getNoticeList(): Promise<AnnouncementResult> {
-    return defHttp.get({
-        url: `${API.NOTICE_LIST}`
-    })
+export function getNoticeList() : Promise<AnnouncementResult> {
+	return defHttp.get({
+		url: `${API.NOTICE_LIST}`
+	})
 }

src/apis/map4tx.ts

@@ -0,0 +1,29 @@
+import { encode } from 'punycode';
+import { defHttp } from '~/utils/http'
+
+enum API {
+	MAP_KEY = '5HEBZ-ND26N-CMKFV-SNV2K-IOTTQ-VCFAQ'
+}
+
+
+export function apiGetCityName(latitude : any, longitude : any) {
+	const url = `https://apis.map.qq.com/ws/geocoder/v1/?location=${latitude},${longitude}&key=${API.MAP_KEY}`;
+
+	wx.request({
+		url, success: (res) => {
+			const city = res.data.result.address_component.city;
+		}
+	});
+
+
+}
+
+export function apiGetLongitudeAndLatitude(city : string,callBack:Function) {
+	let apiUrl = `https://apis.map.qq.com/ws/geocoder/v1/?address=${city}&key=${API.MAP_KEY}`;
+	uni.request({
+		url: apiUrl,
+		success: (res) => {
+			callBack && callBack(res)
+		}
+	})
+}

src/apis/movies.ts

@@ -0,0 +1,107 @@
+import { defHttp } from '~/utils/http'
+
+enum API {
+	HOME_MOVIE_LIST = '/api/movie/film?',
+	CINEMA_LIST = '/api/movie/cinema?',
+	MOVIE_CITY_LIST = '/api/movie/city',
+	FILMSCHED_DATE_LIST = '/api/movie/filmsched_date?film_sign=',
+	CINEMAFILM_SCHED_LIST = '/api/movie/cinemafilm_sched?',
+	FILM_SCHED_LIST = '/api/movie/film_sched?',
+	SCHED_SEAT_LIST =  '/api/movie/sched_seat?',
+	MOVIES_ORDER_LIST =  '/api/movie/order_list?',
+	ORDER_INFO =  '/api/movie/order_info',
+	SUBMIT_ORDER =  '/api/movie/submit_order',
+	ORDER_LIST =  '/api/movie/order_list?',
+	CONFIRM_ORDER =  '/api/movie/confirm_order',
+	
+}
+
+
+//订单列表
+export function apiGetOrderList(params:any) {
+	return defHttp.get({
+		url: API.ORDER_LIST +params
+	})
+}
+
+//确认订单（付款）
+export function apiConfirmOrder(params:any) {
+	return defHttp.post({
+		url: API.CONFIRM_ORDER ,
+		data:params
+	})
+}
+
+//锁座订单
+export function apiSubmitOrder(params:any) {
+	return defHttp.post({
+		url: API.SUBMIT_ORDER ,
+		data:params
+	})
+}
+
+//订单详情
+export function apiGetOrderInfo(params:any) {
+	return defHttp.get({
+		url: API.ORDER_INFO +'?order_sn='+params
+	})
+}
+
+export function apiGetmoviesOrderList(params:any) {
+	return defHttp.get({
+		url: API.MOVIES_ORDER_LIST +params
+	})
+}
+
+//获取场次座位
+export function apiGetSchedSeatList(params:any) {
+	return defHttp.get({
+		url: API.SCHED_SEAT_LIST +params
+	})
+}
+//根据根据影片排片日期查询排片影院
+export function apiGetFilmSchedList(params:any) {
+	return defHttp.get({
+		url: API.FILM_SCHED_LIST +params
+	})
+}
+//根据影院影片场次日期查询场次列表
+export function apiGetCinemafilmSchedList(params:any) {
+	return defHttp.get({
+		url: API.CINEMAFILM_SCHED_LIST +params
+	})
+}
+
+//获取影片场次日期列表
+
+export function apiGetFilmschedDate(film_sign:any) {
+	return defHttp.get({
+		url: API.FILMSCHED_DATE_LIST +film_sign
+	})
+}
+
+//电影市区、首字母列表
+export function apiGetCityList() {
+	return defHttp.get({
+		url: API.MOVIE_CITY_LIST 
+	})
+}
+
+//获取影院列表
+export function apiGetCinemaList(params : any) {
+	return defHttp.get({
+		url: API.CINEMA_LIST + params
+	})
+}
+//获取影片列表
+export function apiGetHomeMovieList(type : any) {
+	return defHttp.get({
+		url: API.HOME_MOVIE_LIST + "page=1&limit=15&type=0" 
+	})
+}
+//获取影片列表
+export function apiGetMovieList(params : any) {
+	return defHttp.get({
+		url: API.HOME_MOVIE_LIST + params
+	})
+}

src/apis/order.api.ts

@@ -71,7 +71,8 @@ enum API {
     // 售后-订单列表
     REFUND_LIST = '/api/refund/list',
     // 三方订单
-    USER_THIRD_ORDER = '/api/user/third_order',
+   // USER_THIRD_ORDER = '/api/user/third_order',
+	USER_THIRD_ORDER = '/api/user/third_order_bill',
     // 全部订单
     ORDER_ALL = '/api/order/all',
     // 获取微信支付小程序原始id和支付链接

src/apis/product.ts

@@ -24,6 +24,8 @@ enum API {
     PRODUCT_SHARE = '/api/product_share',
     // 京东商品详情
     JD_DETAIL = '/api/jd/detail',
+	// 京东转链
+	JD_LINK = '/api/jd/chang_link',
 	// 未登录京东商品详情
 	JTT_DETAIL = '/api/jtt/detail',
     // 京东商品列表
@@ -147,6 +149,20 @@ export  function getJdProductDetail(skuId: string): Promise<JdgProductDetailMode
 }
 
 /**
+ * 京东商品详情转链接
+ * @param skuId
+ */
+export  function getJdLink(skuId: string,discount_link:string) {
+    return detailHttp.get({
+        url: API.JD_LINK,
+        data: {
+            skuId,
+			discount_link
+        }
+    })
+}
+
+/**
  * 未登录获取京东商品详情
  * @param skuId
  */

src/apis/quickLink.ts

@@ -34,6 +34,9 @@ enum API {
 	
 	GET_SU_PRODUCT = '/api/su/list?limit=10&',
 	GET_SU_SEARCH_PRODUCT = '/api/su/search?limit=10&',
+	
+	GET_COMMERCE_LIST = '/api/store/merchant/product/commerce_list?limit=10&page=',
+	
  
 
 }
@@ -208,6 +211,15 @@ export function apiGetProductType(id : any) {
 }
 
 /**
+ * 商贸区列表
+ */
+export function apiGetCommerceList(id : any,page:any) {
+	return defHttp.get({
+		url: id ? (API.GET_COMMERCE_LIST +page+ "&category_id=" + id) : API.GET_COMMERCE_LIST+page
+	}, { withToken: false })
+}
+
+/**
  *产品
  */
 export function apiGetProductList(id : any) {

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -176,14 +176,14 @@ function handleCountChange(value) {
 
           <!--          </scroll-view>-->
         </div>
-        <div class="p-3">
+       <!-- <div class="p-3">
           <div class="flex  justify-between text-sm">
             数量
             <nut-input-number v-model="count" @change="handleCountChange" />
           </div>
 
 
-        </div>
+        </div> -->
       </div>
 
       <div class="px-3 pb-12" v-if="isTo == 1">

src/config/app.ts

@@ -6,9 +6,13 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
 
 
 let httpApi = 'https://testapi.hxxfb.com'
+
 //let httpApi = 'https://api.hxxfb.com'
 
+console.log("===httpApi=====111111111",httpApi);
+console.log("===httpApi",httpApi);
 export const BASE_URL = httpApi
+console.log("===BASE_URL",BASE_URL);
 export const CDN_URL = 'https://cdn.bjtdba.com/chuxubao'
 export const CDM_URL = 'https://cdn.bjtdba.com/vod'
 export const IMG_CDN_URL='https://api.hxxfb.com/share/xcx/'

src/constants/index.ts

@@ -3,7 +3,11 @@ export const USER_LATITUDE = 'user_latitude'
 // 用户经度
 export const USER_LONGITUDE = 'user_longitude'
 
+// 用户选择城市
+export const USER_CHOOSE_CITY = 'user_choose_city'
 
+//用户选择城市编码
+export const USER_CHOOSE_CITY_CODE = 'user_choose_city_code'
     //token
 export const  LOGIN_STATUS = 'LOGIN_STATUS_TOKEN'
     // uid

src/libs/amap-wx.ts

@@ -288,6 +288,29 @@ class AmapWx {
             })
         })
     }
+	
+	/**
+	 * 地址逆编码
+	 */
+	getLongitudeAndLatitude(props: { address: string }) {
+	    return new Promise((success, fail) => {
+	        const config: RequestConfig & { address: string; extensions: string } = {
+	            address: props.address || '',
+	            extensions: 'all',
+	            ...this.requestConfig,
+	        }
+	        wx.request({
+	            url: 'https://restapi.amap.com/v3/geocode/geo',
+	            data: config,
+	            method: 'GET',
+	            header: { 'content-type': 'application/json' },
+	            success,
+	            fail,
+	        })
+	    })
+	}
+	
+	
     /**
      * 获取天气
      */

src/pages/annuity/index.vue

@@ -43,7 +43,7 @@ const progress = [{
   title: '计入账号开通',
   icon: `${CDN_URL}/static/assets/cxb_kt_220914.png`,
 }]
-
+const defaultHeadImg=ref('https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png')
 const state = reactive({
   all_yanglao: 0,
   all_num: 0,
@@ -180,7 +180,7 @@ const ImgType = computed(() => {
       <div class="flex flex-col bg-white rounded  p-4">
         <div class="flex items-center w-full gap-2">
           <image
-            v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+            v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar.indexOf('http://')!= -1?userInfo.avatar:defaultHeadImg" mode="widthFix"
             class="w-9 h-9 rounded-full"
           />
           <image v-else src="https://app.bjtdba.com/uploads/logo.jpg" style="width:74rpx; height:74rpx;" class=" rounded-full" />

src/pages/dacang/list/components/life-product.vue

@@ -11,7 +11,11 @@
 		pageType:{
 			type:Number,
 			default:0
-		}
+		},
+		initType:{
+			type:Number,
+			default:0
+		},
 	})
 
 	function dealNum(value) {
@@ -21,7 +25,7 @@
 	
 	function handleProductItemClick(item) {
 		 uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}&initType=${props.initType}`
 		})
 	}
 </script>
@@ -53,7 +57,7 @@
 				<text class="price-x">{{item.ot_price}}</text>
 				<view v-if="pageType==0" class="jf-content">积分</view>
 				<view v-if="pageType==0" class="jd-content">京豆</view>
-				<text v-if="pageType==1"  class="sell">已售{{item.sales}}件</text>
+				<text v-if="pageType==1"  class="sell">已售{{item.sales}}</text>
 			</view>
 
 		</view>
@@ -131,8 +135,9 @@
 				align-items: center;
 				margin-top: 20rpx;
 			
+				
 				.annuity-value {
-					background-color: antiquewhite;
+					background-color: #f5f5f5;
 					color: #F83554;
 					font-size: 24rpx;
 					border-radius: 4rpx;
@@ -140,7 +145,7 @@
 					padding-right: 4rpx;
 				}
 				.annuity-value-x {
-					background-color: #faf0f1;
+					background-color: #ffefef;
 					color: #F83554;
 					font-size: 24rpx;
 					border-radius: 4rpx;

src/pages/dacang/list/index.vue

@@ -27,7 +27,7 @@
 		</view>
 
 		<view class="bottom-content">
-			<ProductList :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
+			<ProductList :initType ='4' :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
 			<CXBEmpty v-else></CXBEmpty>
 		</view>
 	</div>
@@ -176,8 +176,9 @@
 	})
 
 	function handleItemClick(item) {
+		console.log("====");
 		uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}&initType=4`
 		})
 	}
 

src/pages/home/components/movies.vue

@@ -1,5 +1,49 @@
+<template>
+	<view class="movies-container">
+
+		<view class="title-content">
+			<text :class="currentIndex==0?'big-title':'small-title'" @click="onTabClick(0)">热映影片</text>
+			<text :class="currentIndex==1?'big-title':'small-title'" @click="onTabClick(1)">即将上映</text>
+			<view class="right-title" @click="onDetailClick">
+				<text class="more-title">查看全部</text>
+				<image class="more-icon" :src="ICON_CDN_URL+'order_store_entry_220624.png'" mode="widthFix"></image>
+			</view>
+		</view>
+		<view class="goods-scoll-content">
+			<scroll-view scroll-x="true" class="goods-scoll-item">
+				<view @click="onDetailClick" class="goods-scoll-item-x"
+					v-for="(item,index) in list" :key="'movies-item-'+index">
+					<view class="card-content">
+						<view class="card-item" >
+							<view class="card-img-content">
+								<image class="card-img" :src="item.cover_img" mode="aspectFill"></image>
+								<view class="card-grade">评分：{{item.grade}}</view>
+							</view>
+							<text class="card-title">{{item.film_name}}</text>
+							<text v-if="currentIndex==0" class="card-btn" @click="onDetailClick">购票</text>
+							<text v-if="currentIndex==1" class="card-des">3月28日上映</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+
+
 <script lang="ts" setup>
 	import { IMG_CDN_URL, ICON_CDN_URL } from '~/config/app'
+	
+	const props = defineProps({
+	  list: {
+	    type: Array,
+	    required: true,
+	    default: () => {
+	      return []
+	    }
+	  }
+	})
 	const currentIndex = ref(0)
 
 	const moviesList = ref([
@@ -18,34 +62,24 @@
 			title: '帕丁顿熊3'
 		}
 	])
-	function onItemClick() {
-		uni.showToast({ title: '功能升级中...' })
+	
+	function onDetailClick(){
+		
+		// uni.showToast({
+		// 	title:'功能升级中...',
+		// 	icon:'none'
+		// })
+		uni.navigateTo({
+			url:'/subPages/pages/movies/moviesIndex'
+		})
+	}
+	
+	function onTabClick(position:number){
+		currentIndex.value =position
+		uni.$emit('movie_tab_click',position)
 	}
 </script>
 
-<template>
-	<view class="movies-container">
-
-		<view class="title-content">
-			<text class="big-title">热映影片</text>
-			<text class="small-title">即将上映</text>
-			<view class="right-title" @click="onItemClick">
-				<text class="more-title">查看全部</text>
-				<image class="more-icon" :src="ICON_CDN_URL+'order_store_entry_220624.png'" mode="widthFix"></image>
-			</view>
-		</view>
-
-		<view class="card-content">
-			<view @click="onItemClick" class="card-item" v-for="(item,index) in moviesList" :key="'movies-item-'+index">
-				<image class="card-img" :src="item.img" mode="aspectFill"></image>
-				<text class="card-title">{{item.title}}</text>
-				<text class="card-btn">购票</text>
-			</view>
-		</view>
-
-
-	</view>
-</template>
 
 <style scoped lang="scss">
 	.movies-container {
@@ -56,11 +90,41 @@
 		margin-right: 20rpx;
 		background: #FFFFFF;
 		border-radius: 20rpx;
-		padding: 24rpx;
+		padding-top: 34rpx;
+		padding-left: 12rpx;
+		padding-right: 12rpx;
+		padding-bottom: 34rpx;
+		
+		
+		.goods-scoll-content {
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+		
+			.goods-scoll-item {
+				display: flex;
+				flex-direction: row;
+				white-space: nowrap;
+				width: 100%;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+			}
+		
+			.goods-scoll-item-x {
+				display: inline-block;
+				text-align: center;
+				width: 160rpx;
+				margin-right: 16rpx;
+			}
+		}
+
 
 		.card-content {
 			display: flex;
 			flex-direction: row;
+			width: 160rpx;
+			box-sizing: border-box;
 
 			.card-item {
 				display: flex;
@@ -68,32 +132,72 @@
 				margin-right: 4rpx;
 				margin-left: 4rpx;
 				margin-top: 26rpx;
+				width: 160rpx;
+				
+				.card-img-content{
+					display: flex;
+					flex-direction: column;
+					margin-bottom: 26rpx;
+					position: relative;
+					height: 236rpx;
+					width: 160rpx;
+				}
+				.card-grade{
+					position: absolute;
+					bottom: 0;
+					width: 160rpx;
+					display: flex;
+					border-bottom-right-radius:20rpx ;
+					border-bottom-left-radius:20rpx ;
+					padding-top: 10rpx;
+					padding-bottom: 10rpx;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					color: #fff;
+					z-index: 2;
+					font-size: 24rpx;
+					background: linear-gradient( 180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 100%);
+				}
 
 				.card-img {
-					width: 158rpx;
-					height: 270rpx;
-					border-radius: 20rpx;
-					margin-bottom: 16rpx;
+					width: 160rpx;
+					height: 236rpx;
+					border-radius: 10rpx;
+					background-color: #f8f8f8;
 				}
 
 				.card-title {
 					font-size: 24rpx;
 					color: #333;
 					line-height: 24rpx;
-					margin-bottom: 20rpx;
 					width: 158rpx;
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;
+					text-align: left;
+				}
+				
+				.card-des{
+					font-size: 20rpx;
+					color: #999;
+					line-height: 20rpx;
+					width: 158rpx;
+					text-align: left;
+					margin-top: 30rpx;
 				}
 
 				.card-btn {
 					color: #fff;
 					background-color: #F83554;
-					border-radius: 20rpx;
-					font-size: 28rpx;
+					border-radius: 44rpx;
+					font-size: 24rpx;
 					text-align: center;
+					margin-top: 20rpx;
 					width: 90rpx;
+					height: 44rpx;
+					line-height: 44rpx;
+					text-align: center;
 				}
 			}
 		}
@@ -102,6 +206,7 @@
 			width: 100%;
 			display: flex;
 			flex-direction: row;
+			margin-left: 12rpx;
 			align-items: center;
 
 			.big-title {
@@ -114,13 +219,16 @@
 			.small-title {
 				font-size: 30rpx;
 				color: #333;
-				flex: 1;
+				margin-right: 30rpx;
 			}
 
 			.right-title {
 				display: flex;
 				flex-direction: row;
 				align-items: center;
+				flex: 1;
+				justify-content: flex-end;
+				margin-right: 24rpx;
 
 				.more-title {
 					font-size: 28rpx;

src/pages/home/components/product-new.vue

@@ -157,7 +157,7 @@
 
 			<view class="price-content">
 				<text class="price">{{item.type===6?item.lowestCouponPrice:item.price}}</text>
-				<text class="price-x">{{item.type===6?item.price:item.market_price}}</text>
+				<!-- <text class="price-x">{{item.type===6?item.price:item.market_price}}</text> -->
 				<text class="sell">已售{{item.sales}}件</text>
 			</view>
 
@@ -194,6 +194,7 @@
 					color: #F83554;
 					margin-left: 20rpx;
 					margin-right: 10rpx;
+					flex: 1;
 				}
 
 				.price-x {
@@ -218,7 +219,7 @@
 				margin-top: 20rpx;
 
 				.annuity-value {
-					background-color: antiquewhite;
+					background-color: #f5f5f5;
 					color: #F83554;
 					font-size: 24rpx;
 					border-radius: 4rpx;
@@ -226,7 +227,7 @@
 					padding-right: 4rpx;
 				}
 				.annuity-value-x {
-					background-color: #faf0f1;
+					background-color: #ffefef;
 					color: #F83554;
 					font-size: 24rpx;
 					border-radius: 4rpx;

src/pages/home/index.vue

@@ -8,16 +8,15 @@
 	import Header from '~/pages/home/components/header.vue'
 	import ProductList from '~/pages/home/components/product-new.vue'
 	import { getHomeBanner, getProductShare } from '~/apis/common'
+	import {apiGetHomeMovieList} from '~/apis/movies'
 	import { useUserStore } from '~/stores/userStore'
 	import CXBDialogSIgnIn from '~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue'
 	import { CDM_URL, CDN_URL } from '~/config/app'
 	import CXBPrivacyPopup from '~/components/CXBPrivacyPopup/CXBPrivacyPopup.vue'
 	import { PRODUCT_TAB_ARR } from "./constants.js"
 	import Cache from '~/utils/cache'
-
 	import CXBBackTop from '~/components/CXBBackTop/CXBBackTop.vue'
 	import { getDcSeckill } from '~/apis/dacang'
-
 	const userStore = useUserStore()
 	const usePageStore = usePageStoreWidthOut()
 	usePageStore.setPageConfig({
@@ -51,6 +50,8 @@
 	const productTabList = ref(PRODUCT_TAB_ARR)
 	const currentTopIndex = ref(0)
 	
+	const moviesList =ref([])
+	
 	
 	const state = reactive({
 		shareId: '',
@@ -77,7 +78,8 @@
 		duration: 500,
 		currents: '0',
 		cid: 0,
-		keyword: 0
+		keyword: 0,
+		moviesIndex:0,
 	})
 	// 距离顶部距离
 	const Scroll_X = ref(0)
@@ -136,6 +138,7 @@
 		})
 		state.page = 1
 		loadProductList()
+		getMovieList()
 		loadList('reload')
 		getProductShare().then((res) => {
 			if (res)
@@ -144,8 +147,18 @@
 			// console.log(message)
 		})
 		userStore.setRedirectPage('/pages/home/index', 'tab')
+		uni.$on('movie_tab_click',(value)=>{
+			state.moviesIndex =value
+			getMovieList()
+		})
 		
 	})
+	
+	function getMovieList(){
+		apiGetHomeMovieList(state.moviesIndex).then(res=>{
+			moviesList.value = res.film_list
+		})
+	}
 
 	onShareAppMessage(() => {
 		const shareId = Cache.get('SHARE_ID')
@@ -276,6 +289,7 @@
 		state.page = 1
 		loadProductList()
 		loadList('reload')
+		getMovieList()
 	})
 
 	onReachBottom(() => {
@@ -406,7 +420,7 @@
 					</div>
 				</div>
 				<Navs />
-				<Movies />
+				<Movies :list ='moviesList'/>
 				<div v-if="msProductList.length > 0" class="px-3 relative " style="width: 700rpx; height: 458rpx;">
 					<!-- 秒杀大图 -->
 					<image lazy-load style="width: 100%;height: 100%; " :src="msbkImg" />

src/pages/message/index.vue

@@ -4,6 +4,8 @@ import { getNoticeList } from "~/apis/common";
 import { encodeBase64 } from "~/utils/http/helper";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 const announcementList = ref()
+const htmlHeadValue =ref("<div style='overflow : hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 1; -webkit-box-orient: vertical;word-break: break-all; '>")
+const htmlEndValue =ref("</div>")
 onLoad(async (options) => {
   let res = await getNoticeList()
   console.log(res);
@@ -18,11 +20,28 @@ function go(item: any) {
 
 </script>
 <template>
-  <div class="px-3" v-if="announcementList != undefined">
+ <!-- <div class="px-3" v-if="announcementList != undefined">
     <div v-for="(item, index) in announcementList" :key="index">
       <div @click="go(item)" class="py-2 text_gg " style="border-bottom: 1rpx solid #c0c4cc;">{{ item.title }}</div>
     </div>
-  </div>
+  </div> -->
+  
+  <view class="msg-out-content" v-if="announcementList != undefined">
+	  <view @click="go(item)" class="msg-content" v-for="(item, index) in announcementList" :key="'msg-item-'+index">
+		  <image class="msg-icon" src="/static/icon/img_msg.png" mode="widthFix"></image>
+		  <view class="right-content">
+			  <view class="msg-info">
+			  			  <text class="msg-title">{{item.title}}</text>
+			  			   <text class="msg-date">{{item.create_time}}</text>
+			  </view>
+			  
+			  <rich-text class="msg-des" :nodes="htmlHeadValue+item.content+htmlEndValue"></rich-text>
+		  </view>
+		  
+	  </view>
+  </view>
+
+
   <div v-else class="h-screen w-screen flex flex-col justify-center items-center">
     <CXBEmpty type="message" />
   </div>
@@ -32,7 +51,7 @@ function go(item: any) {
 style:
   navigationBarTitleText: 消息
 </route>
-<style scoped>
+<style scoped lang="scss">
 .text_gg {
   height: 42rpx;
   font-size: 30rpx;
@@ -40,4 +59,52 @@ style:
   font-weight: 400;
   color: #333333;
 }
+
+.msg-out-content{
+	display: flex;
+	flex-direction: column;
+	
+	.msg-content{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		height: 160rpx;
+		border-bottom: 1rpx solid #eeeeee;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		.msg-icon{
+			width: 80rpx;
+			height: 80rpx;
+			min-width: 80rpx;
+			margin-right: 20rpx;
+		}
+		
+		.right-content{
+			display: flex;
+			flex-direction: column;
+		}
+		.msg-info{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			
+			.msg-title{
+				font-size: 32rpx;
+				font-weight: bolder;
+				color: #333;
+				flex: 1;
+			}
+			.msg-date{
+				font-size: 24rpx;
+				color: #999;
+			}
+		}
+		.msg-des{
+			margin-top: 10rpx;
+			font-size: 26rpx;
+			color: #666;
+		}
+	}
+	
+}
 </style>

src/pages/order-confirm/index.vue

@@ -6,7 +6,7 @@
 	import CXBYaojinTag from '~/components/CXBYaojinTag/CXBYaojinTag.vue'
 	import FCell from '~/components/FCell/FCell.vue'
 	import { encodePhone } from '~/utils'
-	import { CDN_URL,IMG_CDN_NEW_URL } from '~/config/app'
+	import { CDN_URL, IMG_CDN_NEW_URL } from '~/config/app'
 	import { useAddressStore } from '~/stores/addressStore'
 	import FField from '~/components/FField/FField.vue'
 
@@ -14,6 +14,10 @@
 	// const addressInfo = ref({})
 	const addressStore = useAddressStore()
 	const userStore = useUserStore()
+	const newVrValue = ref(0)
+	const showVrValue=ref(0)
+	const totalVrValue =ref(0)
+	const isFirstChooseVr=ref(true)
 
 	const data = reactive({
 		cartOrder: [],
@@ -34,11 +38,18 @@
 		// proPrice: ''
 
 		enabled: false,
+		payType:''
 	})
 
-	const defautRadioIcon = ref(IMG_CDN_NEW_URL+'SingleChoice_nor.png')
-	const checkRadioIcon = ref(IMG_CDN_NEW_URL+'SingleChoice_sel.png')
+	const defautRadioIcon = ref(IMG_CDN_NEW_URL + 'SingleChoice_nor.png')
+	const checkRadioIcon = ref(IMG_CDN_NEW_URL + 'SingleChoice_sel.png')
+	let initType=-1
+	
 	onLoad(async (options) => {
+		console.log("===options",options);
+		if(options && options.initType){
+			initType = options.initType
+		}
 		if (options && options.type)
 			data.type = options.type
 
@@ -73,7 +84,7 @@
 			console.log(15999999, res)
 			data.is_dacang_vip_product = res.is_dacang_vip_product
 			data.cartOrder = res.order
-			data.totalPrice = res.order_price
+			data.totalPrice ='￥'+ res.order_price
 			data.orderStatus = res.status
 			// data.proPrice = res.proPrice
 			uni.hideLoading()
@@ -102,11 +113,11 @@
 				title: '暂不发货',
 			})
 		}
-        let fzone_paytypeX 
+		let fzone_paytypeX
 		for (var i = 0; i < data.cartOrder.length; i++) {
 			let cartOrderList = data.cartOrder[i].list
 			for (var j = 0; j < cartOrderList.length; j++) {
-			fzone_paytypeX	= cartOrderList[j].fzone_paytypeX
+				fzone_paytypeX = cartOrderList[j].fzone_paytypeX
 				if (!fzone_paytypeX) {
 					uni.showToast({
 						title: '请选择支付方式！',
@@ -127,8 +138,65 @@
 			distribution_mode: '1',
 			fzone_paytype: JSON.stringify(fzone_paytypeX)
 		}
-		data.enabled = true
-		payment(paymentData)
+		
+		
+		let showTypeDes = ''
+		if (data.payType == 'b1') {
+			showTypeDes =  'VR+积分方式支付,' 
+		} else if (data.payType == 'b2') {
+			showTypeDes =  '现金+积分方式支付,' 
+		} else if (data.payType == 'b3') {
+			showTypeDes =  'VR+京豆方式支付,' 
+		} else if (data.payType == 'b4') {
+			showTypeDes =  '现金+京豆方式支付,' 
+		}  else if (data.payType == 'b5'|| data.payType == 'a1') {
+			showTypeDes =  'VR方式支付,' 
+		} else if (data.payType == 'b6' ||  data.payType == 'a2') {
+			showTypeDes =  '现金方式支付,' 
+		}else if (data.payType == 'c1') {
+			showTypeDes =  '复购金方式支付,' 
+		}else if (data.payType == 'a3') {
+			showTypeDes =  '现金+VR方式支付,' 
+		}
+		
+		let des = ''
+		if(initType==0){//vip
+			des='会员专区商品一旦下单不支持退货退款,您将使用'+showTypeDes+'是否继续支付'
+		}else if(initType==1){//精彩生活
+			des='精彩生活区商品非质量问题不支持退换货请大家确认下单！您将使用'+showTypeDes+'是否继续支付'
+		}else if(initType==2 || initType==3 ){//商贸区
+			des='您将使用'+showTypeDes+'是否继续支付'
+		}else if(initType==4){//精品商城
+			des='精彩生活区商品非质量问题不支持退换货请大家确认下单！您将使用'+showTypeDes+'是否继续支付'
+		}
+		
+		
+		if(newVrValue.value>showVrValue.value){
+			uni.showToast({
+				title:'VR数量大于拥有VR',
+				icon:'none'
+			})
+			return
+		}
+		
+		if(newVrValue.value<0){
+			uni.showToast({
+				title:'VR数量不能小于0',
+				icon:'none'
+			})
+			return
+		}
+		
+		uni.showModal({
+			title:'温馨提示',
+			content:des,
+			complete: (res) => {
+				if(res.confirm){
+					data.enabled = true
+					 payment(paymentData)
+				}
+			}
+		})
 	}
 
 	function payment(createOrderData : CreateOrderRequest) {
@@ -167,14 +235,21 @@
 			orderCreate(createOrderData).then((res) => {
 				if (res) {
 					data.enabled = false
-					console.log(res)
-					// console.log('order_create')
-					console.log(res)
 					uni.hideLoading()
-					uni.navigateTo({
-						//   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
-						url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`,
-					})
+					if(data.payType=='c1' ||  data.payType=='b1' || data.payType=='b3' || data.payType=='b5' || data.payType=='a1'){
+						uni.navigateTo({
+							url: '/pages/payment/success'
+						})
+					}else if(data.payType=='a3' && newVrValue ==totalVrValue){
+						uni.navigateTo({
+							url: '/pages/payment/success'
+						})
+					}else {
+						uni.navigateTo({
+							url: '/pages/payment/index?' + `pay_price=${data.totalPrice}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`,
+						})
+					}
+					
 				}
 			}).catch((err) => {
 				data.enabled = false
@@ -209,7 +284,27 @@
 			})
 		})
 	}
-
+   
+   function onVrInputChange(e,index, fIndex, childIndex){
+	 
+	 if(( totalVrValue.value-e.detail.value)<0){
+		  data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].price=0
+	 }else if(e.detail.value<0){
+		   data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].price=totalVrValue.value
+	 }else {
+		  data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].price=totalVrValue.value -e.detail.value
+	 }
+	  newVrValue.value = e.detail.value
+	  data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].other = e.detail.value
+	  
+	 if(!e.detail.value){
+		 data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].other=0
+		 newVrValue.value = 0
+		 data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].price =totalVrValue.value
+	 }
+	 
+	  data.totalPrice ='￥'+ data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].price +'+'+data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].other+'VR'
+   }
 
 
 	function onRadioClick(index, fIndex, childIndex) {
@@ -219,6 +314,32 @@
 		}
 		data.cartOrder[index].list[fIndex].fzone_paytype[childIndex].checked = true
 		data.cartOrder[index].list[fIndex].fzone_paytypeX = data.cartOrder[index].list[fIndex].fzone_paytype[childIndex]
+		let labItem = data.cartOrder[index].list[fIndex].fzone_paytype[childIndex]
+        data.payType = labItem.type
+		newVrValue.value  =0
+		if (labItem.type == 'b1') {
+			data.totalPrice = '￥' +labItem.price + 'VR+' + labItem.other + '积分'
+		} else if (labItem.type == 'b2') {
+			data.totalPrice = '￥' + labItem.price + '+' + labItem.other + '积分'
+		} else if (labItem.type == 'b3') {
+			data.totalPrice = '￥' + labItem.price + 'VR+' + labItem.other + '京豆'
+		} else if (labItem.type == 'b4') {
+			data.totalPrice = '￥' + labItem.price + '+' + labItem.other + '京豆'
+		}  else if (labItem.type == 'b5'|| labItem.type == 'a1') {
+			data.totalPrice = '￥' +labItem.price + 'VR'
+		} else if (labItem.type == 'b6' ||  labItem.type == 'a2') {
+			data.totalPrice = '￥' + labItem.price
+		}else if (labItem.type == 'c1') {
+			data.totalPrice = '￥' +labItem.price +  '复购金'
+		}else if(labItem.type == 'a3'){
+			data.totalPrice = '￥' + labItem.price +'+'+  labItem.other + 'VR'
+			newVrValue.value  = labItem.other
+			if(isFirstChooseVr.value){
+				showVrValue.value =labItem.other
+				totalVrValue.value = labItem.price+labItem.other
+			}
+			isFirstChooseVr.value=false
+		}
 	}
 
 	function onNumClick(index, fIndex, type) {
@@ -322,46 +443,59 @@
 									{{ orderProductItem.productAttr.sku }}
 								</div>
 							</div>
-							<div class="flex">
-								<CXBYaojinTag v-if="item.mer_id != '148'" :amount="orderProductItem.yanglao" />
-							</div>
+
 							<div class="flex justify-between ">
 								<div v-if="item.mer_id != '148'" style="color:#fa4032">
 									￥{{ orderProductItem.productAttr.price }}
 								</div>
 								<div v-if="item.mer_id == '148'" style="color:#fa4032">
-									{{ Math.round(orderProductItem.productAttr.price
-                    * 30) }}积分
+									{{ Math.round(orderProductItem.productAttr.price* 30) }}积分
 								</div>
-								<!-- <nut-input-number
-				  v-model="orderProductItem.cart_num"
-				  @change="(num) => handleNumberChange(num, orderProductItem)"
-				/> -->
-								<view class="number-content">
+
+								<!-- <view class="number-content">
 									<view @click="onNumClick(index,orderProductItemIndex,0)" class="del">-</view>
 									<text class="num-value">{{orderProductItem.cart_num}}</text>
 									<view @click="onNumClick(index,orderProductItemIndex,1)" class="add">+</view>
-								</view>
+								</view> -->
+							</div>
+							<div class="flex">
+								<CXBYaojinTag v-if="item.mer_id != '148'" :amount="orderProductItem.yanglao" />
 							</div>
 						</div>
 					</div>
 					<view class="radio-content">
 						<view @click="onRadioClick(index,orderProductItemIndex,labIndex)" :key="'radio-item-'+index"
-							class="radio-item" v-for="(labItem,labIndex) in orderProductItem.fzone_paytype">
-							<text class="radio-note">{{labItem.note}}</text>
-							<image :src="labItem.checked==1?checkRadioIcon:defautRadioIcon" class="radio-icon"></image>
-							<text v-if="labItem.type=='b1'"
-								class="radio-name">{{labItem.price}}VR+{{labItem.other}}积分</text>
-							<text v-if="labItem.type=='b2'"
-								class="radio-name">￥{{labItem.price}}+{{labItem.other}}积分</text>
-							<text v-if="labItem.type=='b5'" class="radio-name">{{labItem.price}}VR</text>
-							<text v-if="labItem.type=='b6'" class="radio-name">￥{{labItem.price}}</text>
+							class="radio-item-out" v-for="(labItem,labIndex) in orderProductItem.fzone_paytype">
+							
+							<view class="radio-item">
+								<text class="radio-note">{{labItem.note}}</text>
+								<image  :src="labItem.checked==1?checkRadioIcon:defautRadioIcon" class="radio-icon"></image>
+								<text v-if="labItem.type=='b1'"
+									class="radio-name">{{labItem.price}}VR+{{labItem.other}}积分</text>
+								<text v-if="labItem.type=='b2'"
+									class="radio-name">￥{{labItem.price}}+{{labItem.other}}积分</text>
+								<text v-if="labItem.type=='b3'"
+									class="radio-name">{{labItem.price}}VR+{{labItem.other}}京豆</text>
+								<text v-if="labItem.type=='b4'"
+									class="radio-name">￥{{labItem.price}}+{{labItem.other}}京豆</text>
+								<text v-if="labItem.type=='b5' || labItem.type=='a1'" class="radio-name">{{labItem.price}}VR</text>
+								<text v-if="labItem.type=='b6' || labItem.type=='a2'" class="radio-name">￥{{labItem.price}}</text>
+								<text v-if="labItem.type=='c1'" class="radio-name">{{labItem.price}}复购金 </text>
+								<view v-if="labItem.type=='a3'&& data.payType!='a3'" class="radio-name">￥{{labItem.price}}+{{labItem.other}}VR </view>
+							</view>
+						   <view class="a3-content"   v-if="labItem.type=='a3'&& data.payType=='a3'">
+							<view class="a3-top-content">
+								<text class="radio-note">VR:</text>
+								<input maxlength="6" class="radio-note-input" type="number" :value="newVrValue" @input="onVrInputChange($event ,index,orderProductItemIndex,labIndex)"  />
+								<text class="radio-note">现金:</text>
+								<input disabled class="radio-note-input" type="text" v-model="labItem.price" />
+							</view>
+							<text class="radio-note"> 剩余VR:{{showVrValue}}</text>
+						   </view>
 						</view>
 					</view>
-
 				</div>
 
-
 				<div>
 					<!-- 优惠券数据 先写死 -->
 					<FCell v-if="item.mer_id != '148'" title="优惠劵"
@@ -370,11 +504,6 @@
 					<FCell v-if="item.mer_id == '148'" title="积分"
 						:value="userStore.userInfo.score != '0' ? userStore.userInfo.score : '暂无积分'" arrow />
 					<FCell title="运费" :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'" arrow />
-					<!--            <FCell -->
-					<!--                title="留言" -->
-					<!--                value="建议留言前先与商家沟通确认" -->
-					<!--                arrow -->
-					<!--            ></FCell> -->
 					<FField v-model="data.mark" label="留言" placeholder="建议留言前先与商家沟通确认" :ex-class="['text-right']" />
 				</div>
 			</div>
@@ -388,8 +517,8 @@
 				<div v-if="data.type && data.type == '3'" style="color:#fa4032">
 					{{ Math.round(data.totalPrice * 30) }}积分
 				</div>
-				<div v-else style="color:#fa4032">
-					￥{{ data.totalPrice }}
+				<div class="submit-price-content" v-else style="color:#fa4032">
+					{{ data.totalPrice }}
 				</div>
 			</div>
 			<div class="flex">
@@ -407,6 +536,41 @@ style:
 </route>
 
 <style lang="scss">
+	
+	.submit-price-content{
+		width: 340rpx;
+		word-break:break-all;
+	}
+	
+	.a3-content{
+		display: flex;
+		flex-direction: column;
+	    justify-content: center;
+		margin-bottom: 20rpx;
+		margin-left: 100rpx;
+		
+		
+		.a3-top-content{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-bottom: 10rpx;
+		}
+		.radio-note{
+			font-size: 28rpx;
+			margin-right: 10rpx;
+			color: #333;
+		}
+		.radio-note-input{
+			width: 130rpx;
+			font-size: 28rpx;
+			padding-left: 10rpx;
+			color: #333;
+			margin-right: 30rpx;
+			border: 1rpx solid #999;
+			border-radius: 10rpx;
+		}
+	}
 	.number-content {
 		display: flex;
 		flex-direction: row;
@@ -418,6 +582,8 @@ style:
 			color: #333;
 			font-weight: bolder;
 		}
+		
+		
 
 		.num-value {
 			background-color: #f8f8f8;
@@ -440,6 +606,10 @@ style:
 		flex-direction: column;
 		margin-top: 20rpx;
 		margin-bottom: 20rpx;
+		.radio-item-out{
+			display: flex;
+			flex-direction: column;
+		}
 
 		.radio-item {
 			display: flex;
@@ -459,6 +629,8 @@ style:
 			.radio-name {
 				font-size: 26rpx;
 				color: #333;
+				max-width: 276rpx;
+				word-break:break-all;
 			}
 
 			.radio-icon {

src/pages/payment/index.vue

@@ -17,6 +17,7 @@ const state = reactive({
   memberType: 0,
   initType:0,
   tabIndex: Number.NaN,
+  orderSn:''
 })
 onLoad((options) => {
   // console.log('我是options',options)
@@ -24,7 +25,9 @@ onLoad((options) => {
     state.orderList = options.OrderList
     state.payPrice = options.pay_price
     state.orderId = options.order_id
-	state.initType =options.initType
+	state.initType =options.initType //3 电影购票 1充值话费
+	state.orderSn = options.orderSn
+	console.log("===options.pay_price",options.pay_price);
 
     if (options.tabIndex)
       state.tabIndex = options.tabIndex
@@ -59,7 +62,7 @@ function handleConfirm() {
     extraData: {
       oid: state.orderId,
       OrderLists: state.orderList?state.orderList:[],
-      type: state.initType==1?'xfbspzfHF':'xfbspzf',// 商品--xfbspzf  话费--xfbspzfHF
+      type: state.initType==1?'xfbspzfHF':(state.initType==3?'dyxfbzh':'xfbspzf'),// 商品--xfbspzf  话费--xfbspzfHF
     },
     envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
     // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
@@ -86,6 +89,14 @@ function onClickLeft() {
 	 })
 		return
 	}
+	
+	if(state.initType==3){
+		uni.navigateBack({
+		  delta: 1,
+		})
+		return
+	}
+	
   uni.showModal({
     title: '确认要离开收银台?',
     content: '您的订单在24小时内未支付将被取消，请尽快完成支付。',
@@ -147,7 +158,7 @@ function onClickLeft() {
         <div class="text-xs text-gray-500">
           支付金额
         </div>
-        <FPrice :price="state.payPrice" ex-class="!text-xl font-bold" />
+      <view class="price">{{state.payPrice}}</view>
       </div>
       <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
         <div class="flex f-hairline-bottom text-sm pb-2">
@@ -185,3 +196,12 @@ page {
   background: #f8f8f8;
 }
 </style>
+
+<style scoped lang="scss">
+.price{
+	font-size: 40rpx;
+	color: red;
+	margin-top: 10rpx;
+	font-weight: bolder;
+}
+</style>

src/pages/store/nearby/index.vue

@@ -79,7 +79,7 @@ onShow(()=>{
 		icon:'none'
 	})
 	setTimeout(()=>{
-		 if (pageStore.currentPage.type === 'tab') {
+		 if (pageStore?.currentPage?.type === 'tab') {
 		   uni.switchTab({
 		     url: pageStore.currentPage.url,
 		   })
@@ -113,18 +113,6 @@ onShareTimeline(() => {
     // imageUrl: 'https://cdn.bjtdba.com/vod/image/2023-10-09/20231009202402136.png'
   }
 })
-onShow(() => {
-  // usePageStore.setPageConfig({
-  //   currentPage: {
-  //     type: 'tab',
-  //     url: '/pages/store/nearby/index',
-  //   },
-  // })
-  // console.log('onshow...')
-
-  // if (state.loadType)
-	 //  loadSelectMerchant(state.loadType)
-})
 
 function loadAll() {
   state.category_id = 0

src/pages/user/index.vue

@@ -2,7 +2,7 @@
 	import type { Ref } from 'vue'
 	import { useUserStore } from '~/stores/userStore'
 	import { getUserInfo, apiGetUserToken, getNewSignInInfo, getNewSignIn } from '~/apis/user'
-	import { CDM_URL, CDN_URL, IMG_CDN_NEW_URL, ICON_CDN_URL,BASE_URL } from '~/config/app'
+	import { CDM_URL, CDN_URL, IMG_CDN_NEW_URL, ICON_CDN_URL,BASE_URL,IMG_CDN_URL } from '~/config/app'
 	import { totalOrderNumber } from '~/apis/order.api'
 	import type { OrderQuantityModel } from '~/apis/model/order.model'
 	import CXBDialogSIgnIn from '~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue'
@@ -11,6 +11,8 @@
 	const userStore = useUserStore()
 	const userTokenInfo = ref()
 	const currentType = ref('')
+	
+	const defaultHeadImg=ref('https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png')
 	const myOrderList = [{
 		id: 'noPay',
 		icon: `${CDN_URL}/static/assets/obligation_220620.png`,
@@ -189,7 +191,6 @@
 			let _token = userTokenInfo.value
 			console.log("===_token", _token);
 			if (item.text === '店铺管理') {
-				
 				let params=
 					{
 						x_token:_token.mweb_info.x_token,
@@ -291,37 +292,30 @@
 		if (!userInfo) {
 			return ''
 		}
-		const userRichType = userInfo.value.user_rich_type
+		const userRichType = userInfo.value.user_group
 		// console.log(userStore.userInfo)
-		// 普通用户
-		if (userRichType == 0)
-
-			return IMG_CDN_NEW_URL + '用户.png'
-
-		// 会员
+		// 用户
 		if (userRichType == 1)
-
-			return IMG_CDN_NEW_URL + '会员.png'
-
+			return IMG_CDN_NEW_URL + '用户.png'
+		// 业务员
+		if (userRichType == 2)
+			return IMG_CDN_URL + 'icon_yewuyuan.png'
+		// 业务经理
 		if (userRichType == 3)
-
-			return IMG_CDN_NEW_URL + '创始人.png'
-
-		// 高级会员
+			return IMG_CDN_URL + 'icon_yewujingli.png'
+		// 初级合伙人
 		if (userRichType == 4)
-
-			return IMG_CDN_NEW_URL + '高级会员.png'
-
-		if (userRichType == 8)
-
-			return IMG_CDN_NEW_URL + '合伙人.png'
-
-		if (userRichType == 9)
-
-			return IMG_CDN_NEW_URL + '联合创始人.png'
-
+			return IMG_CDN_URL + 'icon_chuji.png'
+		// 中级合伙人
+		if (userRichType == 5)
+			return IMG_CDN_URL + 'icon_zhongji.png'
+			// 高级合伙人
+		if (userRichType == 6)
+			return IMG_CDN_URL + 'icon_gaoji.png'
+			// 董事
+		if (userRichType == 7)
+				return IMG_CDN_URL + 'icon_member_dongshi.png'
 		if (!userRichType)
-
 			return ''
 	})
 
@@ -503,7 +497,7 @@
 		<div class="flex flex-col gap-4 relative px-3 pb-safe">
 			<div class="pt-15 ">
 				<div class="flex gap-2 mb-2 text-white mb-6">
-					<image v-if="userInfo&& userInfo.avatar" :src="userInfo.avatar"
+					<image v-if="userInfo&& userInfo.avatar" :src=" userInfo.avatar.indexOf('http://')!= -1?userInfo.avatar:defaultHeadImg"
 						style="min-width: 100rpx; width:100rpx; height:100rpx;" class="rounded-full"
 						@click="handleShowMyProfile" />
 					<image v-else src="https://app.bjtdba.com/uploads/logo.jpg" class="rounded-full"
@@ -520,25 +514,24 @@
 							</div>
 						</div>
 						<view class=" sign-content">
-							<view class=" flex gap-1 ">
-								<!-- 用户 -->
-								<view v-if="userType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit "
-									@click="handleShowMyRulePage()">
-									<image mode="heightFix" lazy-load class="vip_img" :src="userType" />
-								</view>
-								<!-- 市区县代理 -->
-								<view v-if="areaType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit "
-									@click="openPopup">
-									<image mode="heightFix" lazy-load class="vip_img" :src="areaType" />
-								</view>
-								<!-- 股东 -->
-								<view v-if="AlholderType"
-									class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit">
-									<image mode="heightFix" lazy-load class="vip_img" :src="AlholderType" />
-								</view>
-							</view>
+							
+						<!-- 用户 -->
+						<image  v-if="userType" mode="widthFix" lazy-load class="sign-icon" :src="userType" />
+						
+						<!-- 市区县代理 -->
+						<!-- <view v-if="areaType" class="flex rounded-full  text-[12px] text-white w-12 h-5  w-fit "
+							@click="openPopup">
+							<image mode="heightFix" lazy-load class="sign-icon" :src="areaType" />
+						</view>
+						 -->
+						<!-- 股东 -->
+					<!-- 	<view v-if="AlholderType"
+							class="flex rounded-full  text-[12px] text-white w-12 h-5   w-fit">
+							<image mode="heightFix" lazy-load class="sign-icon" :src="AlholderType" />
+						</view> -->
 							<view @click="onSignClick" class="sign-btn">{{state.isCanSignIn?'签到':'已签到'}}</view>
 						</view>
+						
 					</div>
 					<FPopup v-model:show="showValue" position="center" ex-class="box_2 ">
 						<div class="box_2 flex-row">
@@ -610,7 +603,7 @@
 					</view>
 					<view class="card-item" @click="onCardItemClick(7)">
 						<text class="card-title">复购金</text>
-						<text class="card-value">{{userInfo.repurchase_price}}</text>
+						<text class="card-value">{{userInfo.fugou}}</text>
 					</view>
 					<view class="card-item" @click="onCardItemClick(8)">
 						<text class="card-title">我的部门</text>
@@ -744,7 +737,7 @@
 	}
 
 	.vip_img {
-		height: 56rpx;
+		height: 46rpx;
 	}
 
 	.box_2 {
@@ -853,11 +846,21 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
+		height:50rpx ;
+		flex-wrap: wrap;
+		
+		.sign-icon{
+			width: 140rpx;
+			height: 40rpx;
+			margin-right: 10rpx;
+		}
 
 		.sign-btn {
-			padding: 4rpx 30rpx;
+			padding: 0 30rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			text-align: center;
 			font-size: 26rpx;
-			margin-top: 10rpx !important;
 			margin-left: 20rpx;
 			color: #FD1642;
 			background-color: #fff;

src/stores/userStore.ts

@@ -58,9 +58,7 @@ export const useUserStore = defineStore('userStore', {
         async getUserInfo() {
             try {
                 this.userInfo = await getUserInfo();
-                console.log(this.userInfo);
-                
-
+                console.log("getUserInfo===",this.userInfo);
             } catch (error) {
                 uni.navigateTo({
                     url: '/pages/user/login/index'
@@ -81,15 +79,19 @@ export const useUserStore = defineStore('userStore', {
             Cache.clear(LOGIN_STATUS)
             Cache.clear(UID)
             Cache.clear(SHARE_REDIRECT_PAGE)
+			uni.clearStorageSync()
         },
         setUID(uid: string) {
             this.uid = uid
             Cache.set(UID, uid)
         },
+		
         setUserInfo(userInfo: UserInfoModel) {
             this.userInfo = userInfo
             // 这个是存储的对象数据
             Cache.set('USER_INFO', userInfo)
+			console.log("===userInfo.phone",userInfo.phone);
+			uni.setStorageSync('USER_INFO_PHONE',userInfo.phone)
             // Cache.set(USER_INFO, JSON.stringify(userInfo))
         },
         setOpenid(openid: string) {

src/subPages/pages/immediate-withdrawal/index.vue

@@ -11,6 +11,7 @@ import {
   apigetBankList,
   apiAuthVerify,
   apiExtractCreate,
+  apiGetHBInfo
 } from "~/apis/user";
 import { SpreadInfoModel } from "~/apis/model/spreadInfoModel";
 import type { UserYanglaoJinModel } from "~/apis/model/userYanglaoJinModel";
@@ -39,8 +40,10 @@ const radioCheckIcon=IMG_CDN_NEW_URL+'SingleChoice_sel.png'
 const radiodefaultIcon=IMG_CDN_NEW_URL+'SingleChoice_nor.png'
 const bankIndex=ref(0)
 const showPhonePop=ref(false)
-
+const userHBInfo=ref({})
 const bankList=ref([])
+
+const userQbPrice=ref(0)
 // userSpreadInfo.value.brokerage_price
 onLoad((options) => {
   if (options && options.type) {
@@ -48,7 +51,10 @@ onLoad((options) => {
       isshow.value = 1
     } else if (options.type == 2) {
       isshow.value = 2
+    } else if (options.type == 3) {
+      isshow.value = 3
     }
+	console.log("===options.type",options.type);
   }
 })
 onShow(async () => {
@@ -57,19 +63,19 @@ onShow(async () => {
   getBankList()
 
   await userStore.getUserInfo()
+  
   // 佣金信息
   userSpreadInfo.value = await getUserSpreadInfo()
-  console.log(99999, userSpreadInfo.value);
-
+  // 红包信息
+  userHBInfo.value = await apiGetHBInfo()
+  userQbPrice.value = userHBInfo.value?.total_source ? parseFloat(userHBInfo.value?.total_source) : 0 
+  
   yanglaojin.value = await getUserYangLaoJin()
-
   // 提现配置
   widthdrawalConfig.value = await getWithdrawalConfig()
-
-  console.log(widthdrawalConfig.value)
   userBrokeragePrice.value = userSpreadInfo.value?.brokerage_price ? parseFloat(userSpreadInfo.value?.brokerage_price) : 0
-  console.log(userBrokeragePrice.value)
   member_brokerage_price.value = userSpreadInfo.value?.member_brokerage_price ? parseFloat(userSpreadInfo.value?.member_brokerage_price) : 0
+ 
   console.log(member_brokerage_price.value)
   // if (userSpreadInfo.value?.brokerage_price) {
   if (isshow.value == 1) {
@@ -81,7 +87,6 @@ onShow(async () => {
       })
     }
   } else if (isshow.value == 2) {
-
     if (member_brokerage_price.value < widthdrawalConfig.value.withdrawal_money) {
       isDisabled.value = true
       return uni.showToast({
@@ -89,6 +94,14 @@ onShow(async () => {
         icon: 'none'
       })
     }
+  }else if (isshow.value == 3) {
+    if (userQbPrice.value < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
+      return uni.showToast({
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+        icon: 'none'
+      })
+    }
   }
 
 })
@@ -170,6 +183,15 @@ function handleInputAll() {
         icon: 'none'
       })
     }
+  }else if(isshow.value == 3){
+	  if (userQbPrice.value && userQbPrice.value>= widthdrawalConfig.value.withdrawal_money) {
+	    cashWithdrawalAmount.value = userQbPrice.value
+	  } else {
+	    uni.showToast({
+	      title: '可用余额太少，未满足提现要求',
+	      icon: 'none'
+	    })
+	  }
   }
 
 }
@@ -198,8 +220,15 @@ function handleImmediateWithdrawal() {
     })
   }
   
+  if(isshow.value ==3  && userQbPrice.value < widthdrawalConfig.value.withdrawal_money){
+	  return uni.showToast({
+	    title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+	    icon: 'none'
+	  })
+  }
+  
   // 1.用户可提现余额≤最低提现额
-  if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+  if (isshow.value ==1 && userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
     return uni.showToast({
       title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
       icon: 'none'
@@ -207,7 +236,7 @@ function handleImmediateWithdrawal() {
   }
 
   // 2 当输入金额≤可提现余额＜最低提现额度
-  if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userBrokeragePrice.value) && Number.parseFloat(cashWithdrawalAmount.value) < widthdrawalConfig.value.withdrawal_money) {
+  if (isshow.value ==1 &&  Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userBrokeragePrice.value) && Number.parseFloat(cashWithdrawalAmount.value) < widthdrawalConfig.value.withdrawal_money) {
     // 1 判断是否需要实名
     if (!yanglaojin.value?.is_certification == 1) {
       return uni.navigateTo({
@@ -220,9 +249,28 @@ function handleImmediateWithdrawal() {
       icon: 'none'
     })
   }
+  
+  
+  // 2 当输入金额≤可提现余额＜最低提现额度
+  if (isshow.value ==3 &&  Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userQbPrice.value) && Number.parseFloat(cashWithdrawalAmount.value) < widthdrawalConfig.value.withdrawal_money) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+  
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
+  
+  
+  
 
   // 当输入金额＞可提现余额且输入金额≥最低提现额度
-  if ((Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(userBrokeragePrice.value)) && (Number.parseFloat(cashWithdrawalAmount.value) >= widthdrawalConfig.value.withdrawal_money)) {
+  if (isshow.value ==3 &&(Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(userQbPrice.value)) && (Number.parseFloat(cashWithdrawalAmount.value) >= widthdrawalConfig.value.withdrawal_money)) {
     // 1 判断是否需要实名
     if (!yanglaojin.value?.is_certification == 1) {
       return uni.navigateTo({
@@ -235,6 +283,22 @@ function handleImmediateWithdrawal() {
       icon: 'none'
     })
   }
+  
+  
+  // 当输入金额＞可提现余额且输入金额≥最低提现额度
+  if (isshow.value ==1 &&(Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(userBrokeragePrice.value)) && (Number.parseFloat(cashWithdrawalAmount.value) >= widthdrawalConfig.value.withdrawal_money)) {
+    // 1 判断是否需要实名
+    if (!yanglaojin.value?.is_certification == 1) {
+      return uni.navigateTo({
+        url: '/pages/real-name-authentication/index'
+      })
+    }
+  
+    return uni.showToast({
+      title: '输入金额超过可提现余额',
+      icon: 'none'
+    })
+  }
  
   showPhonePop.value=true
   //发送验证码
@@ -386,7 +450,7 @@ function onSubmitClick(){
 <template>
   <!-- 佣金提现 -->
 
-  <div class="p-3 flex flex-col gap-3" v-if="isshow == 1">
+  <div class="p-3 flex flex-col gap-3" v-if="isshow == 1 ||isshow == 3">
     <div class="flex justify-end">
       <div class=" text-sm" @tap="handleWithdrawalRecord">提现记录</div>
     </div>
@@ -403,12 +467,9 @@ function onSubmitClick(){
         <div class="text-xs text-red" @click="handleInputAll">全部提现</div>
       </div>
       <div class="flex text-gray items-center gap-3 text-sm">
-        <div v-if="userSpreadInfo">
-          可用余额￥：{{ userBrokeragePrice }}
+        <div >
+          可用余额￥：{{isshow==1? userBrokeragePrice:userQbPrice }}
         </div>
-     <!--   <div v-if="userStore.userInfo">
-          可用积分：{{ userStore.userInfo.score }}
-        </div> -->
       </div>
 
     </div>
@@ -416,22 +477,8 @@ function onSubmitClick(){
       <div class="flex f-hairline-bottom font-bold text-sm pb-2">
         提现至
       </div>
-	  
-      <!-- <div>
-        <div class="flex items-center justify-between py-3">
-          <div class="flex items-center gap-2">
-            <image :src="wx_logoImage" mode="widthFix" class="w-8 h-8"></image>
-            <div>微信</div>
-          </div>
-          <div>
-            <radio :checked="true" v-if="iswxshow == true" />
-            <radio :checked="false" v-if="iswxshow == false" @click="Tochecked" />
-          </div>
-        </div>
-      </div> -->
-	  
+     
 	  <view class="bank-list-content">
-		  
 		  <view v-if="bankList&& bankList.length!=0" class="bank-item-out" v-for="(item,index) in bankList" :key="'bank-item-'+index">
 			  <view class="bank-item" @click.stop="onItemClick(index)">
 			  			  <image class="bank-icon" :src="IMG_CDN_NEW_URL+'icon_bank_card.png'" mode="widthFix"></image>

src/subPages/pages/income/index.vue

@@ -3,7 +3,7 @@
 
 
 		<view class="top-f-content">
-			<view class="top-hint">
+			<!-- <view class="top-hint">
 				<text class="hint">当日分红奖次日1时结算，推荐奖实时结算</text>
 				<view class="c-line"></view>
 
@@ -13,7 +13,7 @@
 						<image class="down-icon" :src="IMG_CDN_NEW_URL+'sanjiaoxing.png'" mode="widthFix"></image>
 					</view>
 				</picker>
-			</view>
+			</view> -->
 			<view class="date-content">
 				<picker class="date-choose" mode="date" fields='month' @change="onDateChange">
 					<view class="date-choose">
@@ -31,12 +31,12 @@
 				v-for="(item,index) in dataInfo.pageInfo.data" :key="'list-item-'+index">
 				<view class="list-item">
 					<view class="item-in">
-						<text class="item-title">{{currentTypeList[commission_type]?currentTypeList[commission_type]:'推荐奖'}}</text>
+						<text class="item-title">{{item.mark?item.mark:'推荐奖'}}</text>
 						<text class="item-des">{{item.title}}</text>
-						<text class="item-date">结算时间:{{item.create_time}}</text>
+					<!-- 	<text class="item-date">结算时间:{{item.create_time}}</text> -->
 					</view>
 					<view class="item-in">
-						<text class="item-des">{{item.status==0?'未结算':'已结算'}}</text>
+						<text :class="item.status==0?'item-des-x':'item-des'">{{item.status==0?'未结算':'已结算'}}</text>
 						<text class="item-num">{{item.money}}</text>
 					</view>
 				</view>
@@ -140,9 +140,9 @@ style:
 			display: flex;
 			flex-direction: column;
 			background-color: #fff;
-			padding-left: 30rpx;
-			padding-right: 30rpx;
-			margin-top: 210rpx;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
+			margin-top: 130rpx;
 
 
 			.list-item-out {
@@ -180,6 +180,12 @@ style:
 						font-size: 28rpx;
 						margin-bottom: 10rpx;
 					}
+					
+					.item-des-x {
+						color: #ff0000;
+						font-size: 28rpx;
+						margin-bottom: 10rpx;
+					}
 
 					.item-date {
 						color: #666;

src/subPages/pages/mine-top/brokerage.vue

@@ -21,7 +21,7 @@
 					<text class="title">{{dataInfo.no_clear_amount?dataInfo.no_clear_amount:'0'}}</text>
 				</view>
 				<view class="item-c">
-					<text class="title">已经提现(元)</text>
+					<text class="title">已提现(元)</text>
 					<text class="title">{{dataInfo.withdraw_amount?dataInfo.withdraw_amount:'0'}}</text>
 				</view>
 				<view class="item-c">
@@ -71,7 +71,8 @@
 	import {
 		apiGetBrokerageInfo,
 		getUserInfo,
-		apiTransitionVr 
+		apiTransitionVr ,
+		apiGetVRList
 	} from '~/apis/user'
 	import {
 		formatDate
@@ -226,12 +227,20 @@
 	}
 
 	function getList() {
+		uni.showLoading({
+			title:'加载中...',
+			mask:true
+		})
 		apiGetVRList({
 			page: state.page,
 			pm: state.pm
 		}).then(res => {
-			listInfo.value = res
-		})
+			if (state.page === 1) {
+				listInfo.value = res
+			} else {
+				listInfo.value.push(...res)
+			}
+		}).finally(()=>{uni.hideLoading()})
 	}
 
 	onShareAppMessage(() => {

src/subPages/pages/mine-top/contribute.vue

@@ -2,16 +2,30 @@
 	<view class="contribute-container">
 		
 		<view class="top-content-x">
-			<view class="top-card-content">
-				<view class="card-item">
-					<text class="item-title">{{dataInfo.total_source}}</text>
-					<text class="item-value">我的贡献值</text>
+			
+			<view class="top-card-out">
+				<view class="top-card-content">
+					<view class="card-item">
+						<text class="item-title">{{dataInfo.total_source}}</text>
+						<text class="item-value">我的贡献值</text>
+					</view>
+					<view class="card-item">
+						<text class="item-title">{{dataInfo.no_total_source}}</text>
+						<text class="item-value">未生效贡献值</text>
+					</view>
 				</view>
-				<view class="card-item">
-					<text class="item-title">{{dataInfo.no_total_source}}</text>
-					<text class="item-value">未生效贡献值</text>
+				<view class="top-card-content">
+					<view class="card-item">
+						<text class="item-title">{{dataInfo.zhitui}}</text>
+						<text class="item-value">直推贡献值</text>
+					</view>
+					<view class="card-item">
+						<text class="item-title">{{dataInfo.team_gongxian_num}}</text>
+						<text class="item-value">小部门贡献值</text>
+					</view>
 				</view>
 			</view>
+			
 		</view>
 		
 		<view class="tab-content">
@@ -27,7 +41,7 @@
 				<view class="list-item">
 					<view class="top-content">
 						<text class="top-title">{{item.mark}}</text>
-						<text class="top-right">{{currentIndex==0?'+':''}}{{item.number}}</text>
+						<text class="top-right">{{item.number}}</text>
 					</view>
 					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
 				</view>
@@ -80,9 +94,17 @@
 	}
 	
 	function getList(){
-		apiGetGongXianList({page:state.page,pm:state.pm}).then(res => {
-			listInfo.value= res
+		uni.showLoading({
+			title:'加载中...',
+			mask:true
 		})
+		apiGetGongXianList({page:state.page,pm:state.pm==0?0:2}).then(res => {
+			if (state.page === 1) {
+				listInfo.value = res
+			} else {
+				listInfo.value.push(...res)
+			}
+		}).finally(()=>{uni.hideLoading()})
 	}
 	onShareAppMessage(() => {
 		const shareId = Cache.get('SHARE_ID')
@@ -133,14 +155,14 @@
 		.empty-content{
 			display: flex;
 			flex-direction: column;
-			margin-top:450rpx ;
+			margin-top:512rpx ;
 		}
 		.list-content{
 			display: flex;
 			flex-direction: column;
-			margin-top:350rpx ;
-			padding-left: 20rpx;
-			padding-right: 20rpx;
+			margin-top:512rpx ;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
 			.list-item-x{
 				display: flex;
 				flex-direction: column;
@@ -160,7 +182,7 @@
 							font-size: #666;
 						}
 						.top-right{
-							color: #FE0032;
+							color: #333;
 							font-size: 30rpx;
 						}
 					}
@@ -184,9 +206,9 @@
 			align-items: center;
 			position: fixed;
 			z-index: 222;
-			margin-top: 260rpx;
+			margin-top: 420rpx;
 			width: 100%;
-			background-color: #fff;
+			background-color: #f8f8f8;
 			top: 0;
 			left: 0;
 		}
@@ -230,7 +252,7 @@
 			flex-direction: column;
 			background-color:#fe0032;
 			width: 100%;
-			height: 260rpx;
+			height: 420rpx;
 			padding: 20rpx;
 			box-sizing: border-box;
 			position: fixed;
@@ -238,13 +260,20 @@
 			left: 0;
 			z-index: 222;
 		}
-		.top-card-content{
+		
+		.top-card-out{
+			padding: 30rpx;
+			display: flex;
+			flex-direction: column;
 			background-color: #fdddc4;
 			border-radius: 20rpx;
+			height: 100%;
+		}
+		.top-card-content{
 			display: flex;
 			flex-direction: row;
-			height: 100%;
 			align-items: center;
+			margin-top: 40rpx;
 			justify-content: center;
 			.card-item{
 				display: flex;

src/subPages/pages/mine-top/department.vue

@@ -15,30 +15,29 @@
 							<text class="item-title">总业绩</text>
 							<text class="item-value">{{dataInfo.total_performance}}</text>
 						</view>
-						<view class="info-item">
-							<text class="item-title item-yellow">新增业绩</text>
-							<text class="item-value item-yellow">{{dataInfo.new_performance}}</text>
-						</view>
+							<view class="info-btn-content" @click="onShareClick">
+								<image class="info-btn-icon" :src="IMG_CDN_NEW_URL+'icon_team_invitate.png'"  mode="widthFix"></image>
+								<text class="info-tx">邀请好友</text>
+							</view>
 					</view>
 					<view class="info-in-content">
 						<view class="info-item">
 							<text class="item-title">小部门业绩</text>
 							<text class="item-value">{{dataInfo.person_nums_pv}}</text>
 						</view>
-						<view class="info-item">
-							<text class="item-title"></text>
-							<text class="item-value"></text>
-						</view>
+						
 						<view class="info-item">
 							<text class="item-title">大部门业绩</text>
 							<text class="item-value">{{dataInfo.common_nums_pv}}</text>
 						</view>
+						
+						<view class="info-item">
+							<text class="item-title item-yellow">本周新增总业绩</text>
+							<text class="item-value item-yellow">{{dataInfo.new_performance}}</text>
+						</view>
 					</view>
 				</view>
-				<view class="info-btn-content" @click="onShareClick">
-					<image class="info-btn-icon" :src="IMG_CDN_NEW_URL+'icon_team_invitate.png'"  mode="widthFix"></image>
-					<text class="info-tx">邀请好友</text>
-				</view>
+		
 			</view>
 			<view class="page-title">部门数据汇总</view>
 			<view class="tab-content">
@@ -145,7 +144,12 @@
 			tabList.value[0].value =`(${res.common_nums})` 
 			tabList.value[1].value =`(${ res.person_nums})` 
 			dataInfo.value = res
-			listInfo.value = res.team_list.data
+			
+			if (state.page === 1) {
+				listInfo.value = res.team_list.data
+			} else {
+				listInfo.value.push(...res.team_list.data)
+			}
 			uni.hideLoading()
 		})
 	}
@@ -363,11 +367,11 @@
 					flex-direction: row;
 					align-items: center;
 					justify-content: space-around;
+					padding-left: 40rpx;
 
 					.info-item {
 						display: flex;
 						flex-direction: column;
-						align-items: center;
 						flex: 1;
 						margin-top: 20rpx;
 						justify-content: center;

src/subPages/pages/mine-top/jifen.vue

@@ -30,7 +30,7 @@
 					<view class="top-content">
 						<text class="top-title">{{item.mark}}</text>
 						<text
-							class="top-right">{{currentIndex==0?'+':(currentIndex==1?'-':'')}}{{item.reward_socre}}</text>
+							class="top-right">{{item.reward_socre}}</text>
 					</view>
 					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
 				</view>
@@ -126,12 +126,20 @@
 	}
 
 	function getList() {
+		uni.showLoading({
+			title:'加载中...',
+			mask:true
+		})
 		apiGetJFList({
 			page: state.page,
 			pm: state.pm
 		}).then(res => {
-			listInfo.value = res
-		})
+			if (state.page === 1) {
+				listInfo.value = res
+			} else {
+				listInfo.value.push(...res)
+			}
+		}).finally(()=>{uni.hideLoading()})
 	}
 
 	onShareAppMessage(() => {
@@ -227,7 +235,7 @@
 						}
 
 						.top-right {
-							color: #FE0032;
+							color: #333;
 							font-size: 30rpx;
 						}
 					}
@@ -255,7 +263,7 @@
 			z-index: 2;
 			margin-top: 349rpx;
 			width: 100%;
-			background-color: #fff;
+			background-color: #f8f8f8;
 			top: 0;
 			left: 0;
 		}

src/subPages/pages/mine-top/jingdou.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="contribute-container">
-		
+
 		<view class="top-content-x">
 			<view class="top-card-content">
 				<view class="card-item">
@@ -13,75 +13,102 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="tab-content">
-			<view v-for="(item,index) in tabList" :key="'lab-item-x-'+index" class="lab-item-small" @click="onTabClick(index,item.merchant_category_id)">
+			<view v-for="(item,index) in tabList" :key="'lab-item-x-'+index" class="lab-item-small"
+				@click="onTabClick(index,item.merchant_category_id)">
 				<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{item.name}}</text>
 				<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
 			</view>
 		</view>
-		
+
 		<view class="list-content" v-if="listInfo && listInfo.length!=0">
 			<view class="list-item-x" v-for="(item,index) in listInfo" :key="'list-item-'+index">
 				<view class="list-line" v-if="index != listInfo.length-1"></view>
 				<view class="list-item">
 					<view class="top-content">
 						<text class="top-title">{{item.mark}}</text>
-						<text class="top-right">{{currentIndex==0?'+':(currentIndex==1?'-':'')}}{{item.number}}</text>
+						<text class="top-right">{{item.number}}</text>
 					</view>
 					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-else class="empty-content">
-			<CXBEmpty ></CXBEmpty>
+			<CXBEmpty></CXBEmpty>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	
 	import {
 		apiGetJingDouInfo,
 		apiGetJingDouList,
 	} from '~/apis/user'
-	import { getProductShare } from "~/apis/common";
-	import { useUserStore } from '~/stores/userStore'
+	import {
+		getProductShare
+	} from "~/apis/common";
+	import {
+		useUserStore
+	} from '~/stores/userStore'
 	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-	import{IMG_CDN_URL} from '~/config/app.ts'
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
 	const currentIndex = ref(0)
-	const tabList = ref([{name:'入账京豆'},{name:'消耗京豆'},{name:'未生效京豆'}])
-	import {formatDate} from '~/utils/util'
-    const userStore = useUserStore()
-    const dataInfo=ref({})
-	const listInfo=ref([])
+	const tabList = ref([{
+		name: '入账京豆'
+	}, {
+		name: '消耗京豆'
+	}, {
+		name: '未生效京豆'
+	}])
+	import {
+		formatDate
+	} from '~/utils/util'
+	const userStore = useUserStore()
+	const dataInfo = ref({})
+	const listInfo = ref([])
 	const state = reactive({
-		pm :0,
-		page :1
+		pm: 0,
+		page: 1
 	})
-	
+
 	onLoad((option) => {
 		if (option && option.shareId) {
-		  userStore.setShareId(option.shareId)
+			userStore.setShareId(option.shareId)
 		}
 		getProductShare().then(res => {
-		  if (res) userStore.setShareId(res.share_id)
+			if (res) userStore.setShareId(res.share_id)
 		})
 		getInfo()
 		getList()
 	})
-	
-	function getInfo(){
-			apiGetJingDouInfo().then(res=>{
-				dataInfo.value= res
-			})
+
+	function getInfo() {
+		apiGetJingDouInfo().then(res => {
+			dataInfo.value = res
+		})
 	}
-		
-	function getList(){
-			apiGetJingDouList({page:state.page,pm:state.pm}).then(res => {
-				listInfo.value= res
-			})
+
+	function getList() {
+		uni.showLoading({
+			title: '加载中...',
+			mask: true
+		})
+		apiGetJingDouList({
+			page: state.page,
+			pm: state.pm
+		}).then(res => {
+			if (state.page === 1) {
+				listInfo.value = res
+			} else {
+				listInfo.value.push(...res)
+			}
+		}).finally(() => {
+			uni.hideLoading()
+		})
 	}
 
 	onShareAppMessage(() => {
@@ -109,19 +136,17 @@
 	})
 
 	onPullDownRefresh(() => {
-	   state.page=1
-	   getList()
-	   uni.stopPullDownRefresh()
+		state.page = 1
+		getList()
+		uni.stopPullDownRefresh()
 	})
 
 	function onTabClick(position, id) {
 		currentIndex.value = position
-		state.pm =position
-		state.page=1
+		state.pm = position
+		state.page = 1
 		getList()
 	}
-
-	
 </script>
 
 <style lang="scss" scoped>
@@ -131,55 +156,64 @@
 		min-height: 100VH;
 		background-color: #fff;
 		box-sizing: border-box;
-		.empty-content{
+
+		.empty-content {
 			display: flex;
 			flex-direction: column;
-			margin-top:450rpx ;
+			margin-top: 450rpx;
 		}
-		.list-content{
+
+		.list-content {
 			display: flex;
 			flex-direction: column;
-			margin-top:350rpx ;
-			padding-left: 20rpx;
-			padding-right: 20rpx;
-			.list-item-x{
+			margin-top: 350rpx;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
+
+			.list-item-x {
 				display: flex;
 				flex-direction: column;
-				.list-item{
+
+				.list-item {
 					display: flex;
 					flex-direction: column;
 					padding-top: 28rpx;
 					padding-bottom: 28rpx;
-					.top-content{
+
+					.top-content {
 						display: flex;
 						flex-direction: row;
 						align-items: center;
 						margin-bottom: 20rpx;
-						.top-title{
+
+						.top-title {
 							flex: 1;
 							font-size: 28rpx;
 							font-size: #666;
 						}
-						.top-right{
-							color: #FE0032;
+
+						.top-right {
+							color: #333;
 							font-size: 30rpx;
 						}
 					}
-					.date{
+
+					.date {
 						font-size: 26rpx;
 						font-size: #666;
 					}
 				}
-				.list-line{
+
+				.list-line {
 					width: 100%;
 					height: 2rpx;
 					background-color: #f8f8f8;
 				}
 			}
 		}
-		
-		
-		.tab-content{
+
+
+		.tab-content {
 			display: flex;
 			flex-direction: row;
 			align-items: center;
@@ -187,11 +221,11 @@
 			z-index: 222;
 			margin-top: 260rpx;
 			width: 100%;
-			background-color: #fff;
+			background-color: #f8f8f8;
 			top: 0;
 			left: 0;
 		}
-		
+
 		.lab-item-small {
 			display: flex;
 			flex-direction: column;
@@ -199,47 +233,48 @@
 			flex: 1;
 			height: 90rpx;
 			justify-content: center;
-		
+
 			.lab-default-title {
 				font-size: 28rpx;
 				margin-bottom: 10rpx;
 			}
-		
+
 			.lab-title {
 				font-size: 32rpx;
 				margin-bottom: 20rpx;
 				color: #FE0032;
 			}
-		
+
 			.lab-line {
 				width: 50rpx;
 				height: 6rpx;
 				background-color: #FE0032;
 				border-radius: 4rpx;
 			}
-		
+
 			.lab-default-line {
 				width: 50rpx;
 				height: 6rpx;
 				border-radius: 4rpx;
 			}
-		
+
 		}
-        
-		.top-content-x{
+
+		.top-content-x {
 			display: flex;
 			flex-direction: column;
-			background-color:#fe0032;
+			background-color: #fe0032;
 			width: 100%;
 			height: 260rpx;
 			padding: 20rpx;
 			box-sizing: border-box;
 			position: fixed;
-			top:0;
+			top: 0;
 			left: 0;
 			z-index: 222;
 		}
-		.top-card-content{
+
+		.top-card-content {
 			background-color: #fdddc4;
 			border-radius: 20rpx;
 			display: flex;
@@ -247,26 +282,28 @@
 			height: 100%;
 			align-items: center;
 			justify-content: center;
-			.card-item{
+
+			.card-item {
 				display: flex;
 				flex-direction: column;
 				align-items: center;
 				justify-content: center;
 				flex: 1;
-				
-				.item-title{
+
+				.item-title {
 					color: #964929;
 					font-weight: bolder;
 					font-size: 36rpx;
 					margin-bottom: 20rpx;
 				}
-				.item-value{
+
+				.item-value {
 					color: #964929;
 					font-size: 28rpx;
 				}
 			}
 		}
-		
+
 	}
 </style>
 
@@ -276,5 +313,5 @@ style:
   enablePullDownRefresh: true
   navigationBarBackgroundColor: '#fe0032'
   navigationBarTextStyle: white
-  
+
 </route>

src/subPages/pages/mine-top/qianbao.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="contribute-container">
-		
+
 		<view class="top-content-x">
 			<view class="top-card-content">
 				<view class="card-item">
@@ -13,144 +13,170 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="tab-content">
-			<view v-for="(item,index) in tabList" :key="'lab-item-x-'+index" class="lab-item-small" @click="onTabClick(index,item.merchant_category_id)">
+			<view v-for="(item,index) in tabList" :key="'lab-item-x-'+index" class="lab-item-small"
+				@click="onTabClick(index,item.merchant_category_id)">
 				<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{item.name}}</text>
 				<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
 			</view>
 		</view>
-		
+
 		<view class="list-content" v-if="listInfo && listInfo.length!=0">
 			<view class="list-item-x" v-for="(item,index) in listInfo" :key="'list-item-'+index">
 				<view class="list-line" v-if="index != listInfo.length-1"></view>
 				<view class="list-item">
 					<view class="top-content">
 						<text class="top-title">{{item.mark}}</text>
-						<text class="top-right">{{currentIndex==0?'+':'-'}}{{item.number}}</text>
+						<text class="top-right">{{item.number}}</text>
 					</view>
 					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<view v-else class="empty-content">
-			<CXBEmpty ></CXBEmpty>
+			<CXBEmpty></CXBEmpty>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	
 	import {
 		apiGetHBInfo,
 		apiGetHBList,
 		apiTransitionVr
 	} from '~/apis/user'
-	import {formatDate} from '~/utils/util'
-	import { getProductShare } from "~/apis/common";
-	import { useUserStore } from '~/stores/userStore'
+	import {
+		formatDate
+	} from '~/utils/util'
+	import {
+		getProductShare
+	} from "~/apis/common";
+	import {
+		useUserStore
+	} from '~/stores/userStore'
 	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-	import{IMG_CDN_URL} from '~/config/app.ts'
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
 	const currentIndex = ref(0)
-	const tabList = ref([{name:'入账红包'},{name:'出账红包'}])
-    const userStore = useUserStore()
-    const dataInfo=ref({})
-	const listInfo=ref([])
-	const dataNameInfo =ref()
+	const tabList = ref([{
+		name: '入账红包'
+	}, {
+		name: '出账红包'
+	}])
+	const userStore = useUserStore()
+	const dataInfo = ref({})
+	const listInfo = ref([])
+	const dataNameInfo = ref()
 	const state = reactive({
-		pm :0,
-		page :1
+		pm: 0,
+		page: 1
 	})
-	
+
 	onLoad((option) => {
 		if (option && option.shareId) {
-		  userStore.setShareId(option.shareId)
+			userStore.setShareId(option.shareId)
 		}
 		getProductShare().then(res => {
-		  if (res) userStore.setShareId(res.share_id)
+			if (res) userStore.setShareId(res.share_id)
 		})
 		getInfo()
 		getList()
 	})
-	
-	function onItemClick(index){
-		if(index==0){
+
+	function onItemClick(index) {
+		if (index == 0) {
 			handleClickTomo()
-		}else if(index ==1){
+		} else if (index == 1) {
 			uni.showModal({
-				editable:true,
-				title:'请输入佣金转VR数量',
-						placeholderText:'请输入佣金转VR数量',
-						complete: (e) => {
-							if(e.confirm){//去转换
-								transitionVr(e.content)
-							}
-						}
+				editable: true,
+				title: '请输入佣金转VR数量',
+				placeholderText: '请输入佣金转VR数量',
+				complete: (e) => {
+					if (e.confirm) { //去转换
+						transitionVr(e.content)
+					}
+				}
 			})
 		}
-		
+
 	}
-	
-	function transitionVr(num){
-		if(!num || num==0){
+
+	function transitionVr(num) {
+		if (!num || num == 0) {
 			uni.showToast({
-				title:''
+				title: ''
 			})
 			return
 		}
-		apiTransitionVr(num).then(res=>{
-			if(res==200){
+		apiTransitionVr(num).then(res => {
+			if (res == 200) {
 				getInfo()
 			}
-		}).catch(res=>{
+		}).catch(res => {
 			uni.showToast({
-				title:res,
-				icon:'none'
+				title: res,
+				icon: 'none'
 			})
 		})
 	}
-	
+
 	function handleClickTomo() {
-	  if (userStore.userInfo.is_ertification == 1) {
-	    uni.navigateTo({
-	      url: '/subPages/pages/immediate-withdrawal/index?type=1'
-	    })
-	  } else {
-	    setTimeout(() => {
-	      uni.showModal({
-	        title: '温馨提示',
-	        content: '实名认证后才可提现',
-	        cancelText: "取消", // 取消按钮的文字
-	        confirmText: "去认证", // 确认按钮的文字
-	        showCancel: true, // 是否显示取消按钮，默认为 true
-	        confirmColor: '#f55850',
-	        success: (res) => {
-	          if (res.confirm) {
-	            console.log('comfirm') //点击确定之后执行的代码
-	            setTimeout(() => {
-	              uni.navigateTo({
-	                url: '/pages/real-name-authentication/index'
-	              })
-	            }, 300);
-	          } else {
-	            console.log('cancel') //点击取消之后执行的代码
-	          }
-	        }
-	      })
-	    }, 300);
-	  }
-	}
-	
-	function getInfo(){
-			apiGetHBInfo().then(res=>{
-				dataInfo.value= res
+		if (userStore.userInfo.is_ertification == 1) {
+			uni.navigateTo({
+			url: '/subPages/pages/immediate-withdrawal/index?type=3'
 			})
+		} else {
+			setTimeout(() => {
+				uni.showModal({
+					title: '温馨提示',
+					content: '实名认证后才可提现',
+					cancelText: "取消", // 取消按钮的文字
+					confirmText: "去认证", // 确认按钮的文字
+					showCancel: true, // 是否显示取消按钮，默认为 true
+					confirmColor: '#f55850',
+					success: (res) => {
+						if (res.confirm) {
+							console.log('comfirm') //点击确定之后执行的代码
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '/pages/real-name-authentication/index'
+								})
+							}, 300);
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
+				})
+			}, 300);
+		}
 	}
-	function getList(){
-			apiGetHBList({page:state.page,pm:state.pm}).then(res => {
-				listInfo.value= res
-			})
+
+	function getInfo() {
+		apiGetHBInfo().then(res => {
+			dataInfo.value = res
+		})
+	}
+
+	function getList() {
+		uni.showLoading({
+			title: '加载中...',
+			mask: true
+		})
+		apiGetHBList({
+			page: state.page,
+			pm: state.pm
+		}).then(res => {
+			if (state.page === 1) {
+				listInfo.value = res
+			} else {
+				listInfo.value.push(...res)
+			}
+		}).finally(() => {
+			uni.hideLoading()
+		})
 	}
 
 	onShareAppMessage(() => {
@@ -178,19 +204,17 @@
 	})
 
 	onPullDownRefresh(() => {
-	   state.page=1
-	   getList()
-	   uni.stopPullDownRefresh()
+		state.page = 1
+		getList()
+		uni.stopPullDownRefresh()
 	})
 
 	function onTabClick(position, id) {
 		currentIndex.value = position
-		state.pm =position
-		state.page=1
+		state.pm = position
+		state.page = 1
 		getList()
 	}
-
-	
 </script>
 
 <style lang="scss" scoped>
@@ -200,55 +224,64 @@
 		min-height: 100VH;
 		background-color: #fff;
 		box-sizing: border-box;
-		.empty-content{
+
+		.empty-content {
 			display: flex;
 			flex-direction: column;
-			margin-top:450rpx ;
+			margin-top: 450rpx;
 		}
-		.list-content{
+
+		.list-content {
 			display: flex;
 			flex-direction: column;
-			margin-top:350rpx ;
-			padding-left: 20rpx;
-			padding-right: 20rpx;
-			.list-item-x{
+			margin-top: 350rpx;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
+
+			.list-item-x {
 				display: flex;
 				flex-direction: column;
-				.list-item{
+
+				.list-item {
 					display: flex;
 					flex-direction: column;
 					padding-top: 28rpx;
 					padding-bottom: 28rpx;
-					.top-content{
+
+					.top-content {
 						display: flex;
 						flex-direction: row;
 						align-items: center;
 						margin-bottom: 20rpx;
-						.top-title{
+
+						.top-title {
 							flex: 1;
 							font-size: 28rpx;
 							font-size: #666;
 						}
-						.top-right{
-							color: #FE0032;
+
+						.top-right {
+							color: #333;
 							font-size: 30rpx;
 						}
 					}
-					.date{
+
+					.date {
 						font-size: 26rpx;
 						font-size: #666;
 					}
 				}
-				.list-line{
+
+				.list-line {
 					width: 100%;
 					height: 2rpx;
 					background-color: #f8f8f8;
 				}
 			}
 		}
-		
-		
-		.tab-content{
+
+
+		.tab-content {
 			display: flex;
 			flex-direction: row;
 			align-items: center;
@@ -256,11 +289,11 @@
 			z-index: 222;
 			margin-top: 260rpx;
 			width: 100%;
-			background-color: #fff;
+			background-color: #f8f8f8;
 			top: 0;
 			left: 0;
 		}
-		
+
 		.lab-item-small {
 			display: flex;
 			flex-direction: column;
@@ -268,47 +301,48 @@
 			flex: 1;
 			height: 90rpx;
 			justify-content: center;
-		
+
 			.lab-default-title {
 				font-size: 28rpx;
 				margin-bottom: 10rpx;
 			}
-		
+
 			.lab-title {
 				font-size: 32rpx;
 				margin-bottom: 20rpx;
 				color: #FE0032;
 			}
-		
+
 			.lab-line {
 				width: 50rpx;
 				height: 6rpx;
 				background-color: #FE0032;
 				border-radius: 4rpx;
 			}
-		
+
 			.lab-default-line {
 				width: 50rpx;
 				height: 6rpx;
 				border-radius: 4rpx;
 			}
-		
+
 		}
-        
-		.top-content-x{
+
+		.top-content-x {
 			display: flex;
 			flex-direction: column;
-			background-color:#fe0032;
+			background-color: #fe0032;
 			width: 100%;
 			height: 260rpx;
 			padding: 20rpx;
 			box-sizing: border-box;
 			position: fixed;
-			top:0;
+			top: 0;
 			left: 0;
 			z-index: 222;
 		}
-		.top-card-content{
+
+		.top-card-content {
 			background-color: #fdddc4;
 			border-radius: 20rpx;
 			display: flex;
@@ -316,19 +350,20 @@
 			height: 100%;
 			align-items: center;
 			justify-content: center;
-			
-			.card-item-x{
+
+			.card-item-x {
 				display: flex;
 				flex-direction: row;
 				align-items: center;
-				.red-btn{
+
+				.red-btn {
 					padding: 10rpx 40rpx;
 					border-radius: 40rpx;
 					background-color: #FE0032;
 					color: #fff;
 				}
-				
-				.yellow-btn{
+
+				.yellow-btn {
 					padding: 10rpx 40rpx;
 					border-radius: 40rpx;
 					background-color: #f4d227;
@@ -336,27 +371,29 @@
 					margin-left: 40rpx;
 					margin-right: 60rpx;
 				}
-				
+
 			}
-			.card-item{
+
+			.card-item {
 				display: flex;
 				flex-direction: column;
 				flex: 1;
 				margin-left: 80rpx;
-				
-				.item-title{
+
+				.item-title {
 					color: #964929;
 					font-weight: bolder;
 					font-size: 36rpx;
 					margin-bottom: 20rpx;
 				}
-				.item-value{
+
+				.item-value {
 					color: #964929;
 					font-size: 28rpx;
 				}
 			}
 		}
-		
+
 	}
 </style>
 
@@ -366,5 +403,5 @@ style:
   enablePullDownRefresh: true
   navigationBarBackgroundColor: '#fe0032'
   navigationBarTextStyle: white
-  
+
 </route>

src/subPages/pages/mine-top/repurchase.vue

@@ -27,7 +27,7 @@
 				<view class="list-item">
 					<view class="top-content">
 						<text class="top-title">{{item.mark}}</text>
-						<text class="top-right">{{currentIndex==0?'+':(currentIndex==1?'-':'')}}{{item.number}}</text>
+						<text class="top-right">{{item.number}}</text>
 					</view>
 					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
 				</view>
@@ -87,9 +87,19 @@
 	}
 		
 	function getList(){
+		uni.showLoading({
+			title: '加载中...',
+			mask: true
+		})
 			apiGetFGJList({page:state.page,pm:state.pm}).then(res => {
-				listInfo.value= res
-			})
+				if (state.page === 1) {
+					listInfo.value = res
+				} else {
+					listInfo.value.push(...res)
+				}
+			}).finally(() => {
+			uni.hideLoading()
+		})
 	}
 
 	onShareAppMessage(() => {
@@ -149,8 +159,8 @@
 			display: flex;
 			flex-direction: column;
 			margin-top:350rpx ;
-			padding-left: 20rpx;
-			padding-right: 20rpx;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
 			.list-item-x{
 				display: flex;
 				flex-direction: column;
@@ -170,7 +180,7 @@
 							font-size: #666;
 						}
 						.top-right{
-							color: #FE0032;
+							color: #333;
 							font-size: 30rpx;
 						}
 					}
@@ -196,7 +206,7 @@
 			z-index: 222;
 			margin-top: 260rpx;
 			width: 100%;
-			background-color: #fff;
+			background-color: #f8f8f8;
 			top: 0;
 			left: 0;
 		}

src/subPages/pages/mine-top/vr.vue

@@ -26,7 +26,7 @@
 				<view class="list-item">
 					<view class="top-content">
 						<text class="top-title">{{item.mark}}</text>
-						<text class="top-right">{{currentIndex==0?'+':'-'}}{{item.number}}</text>
+						<text class="top-right">{{item.number}}</text>
 					</view>
 					<text class="date">{{formatDate(item.addtime,8,'-')}}</text>
 				</view>
@@ -103,9 +103,19 @@
 	}
 		
 	function getList(){
+		uni.showLoading({
+			title: '加载中...',
+			mask: true
+		})
 			apiGetVRList({page:state.page,pm:state.pm}).then(res => {
-				listInfo.value= res
-			})
+				if (state.page === 1) {
+					listInfo.value = res
+				} else {
+					listInfo.value.push(...res)
+				}
+			}).finally(() => {
+			uni.hideLoading()
+		})
 	}
 
 	onShareAppMessage(() => {
@@ -166,8 +176,8 @@
 			display: flex;
 			flex-direction: column;
 			margin-top:350rpx ;
-			padding-left: 20rpx;
-			padding-right: 20rpx;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
 			.list-item-x{
 				display: flex;
 				flex-direction: column;
@@ -187,7 +197,7 @@
 							font-size: #666;
 						}
 						.top-right{
-							color: #FE0032;
+							color: #333;
 							font-size: 30rpx;
 						}
 					}
@@ -213,7 +223,7 @@
 			z-index: 222;
 			margin-top: 260rpx;
 			width: 100%;
-			background-color: #fff;
+			background-color: #f8f8f8;
 			top: 0;
 			left: 0;
 		}

src/subPages/pages/movies/chooseSeat - 副本.vue

@@ -0,0 +1,619 @@
+<template>
+	<view class="w-100">
+		<view class="bg-f1 h-100vh">
+			<view class="pt-f left-0 w-100 p-0-32 bg-white z1000" :style="'height: 132rpx;top:0'">
+				<view>
+					<view class="fz-34 fw-b pt-20">
+						{{initInfo.film_name}}
+					</view>
+					<view class="mt-10 fz-28 color-666">
+						{{initInfo.show_des}}
+					</view>
+				</view>
+			</view>
+			<movable-area :style="'height:'+(seatRow*40+350)+'rpx;width: 100vw;top:'+(rpxNum*132)+'px'" class="pt-f left-0">
+				<movable-view :style="'width: 100vw;height:'+(seatRow*40+350)+'rpx;'" :inertia="true" :scale="true" :scale-min="0.95"
+				 :scale-max="2" direction="all" @change="onMove" @scale="onScale">
+					<view class="Stage dp-f jc-c ai-c fz-22 color-333">
+						{{initInfo.hall_name}}
+					</view>
+					<view style="width: 100rpx;height: 30rpx;" class="m-0-a mt-48 dp-f jc-c ai-c fz-20 color-999 b-1 br-5">银幕中央</view>
+					
+					<view class="pt-f pa-v-2 b-d-1" :style="'height:'+seatRow*(20+seatSize*pxNum)+'rpx;top:165rpx;width:0'"></view>
+					
+					<view v-for="(item,index) in seatArray" :key="index" class="dp-f jc-c mt-20" :style="'width:'+boxWidth+'px;height:'+seatSize+'px'">
+						<view v-for="(seat,col) in item" :key="col" class="dp-ib" :style="'width:'+seatSize+'px;height:'+seatSize+'px'"
+						 @click="handleChooseSeat(index,col)">
+							<image v-if="seat.status===1" class="w-100 h-100" src="../../static/unselected.png" mode="aspectFit"></image>
+							<image v-else-if="seat.status===2" class="w-100 h-100" src="../../static/selected.png" mode="aspectFit"></image>
+							<image v-else-if="seat.status===0" class="w-100 h-100" src="../../static/bought.png" mode="aspectFit"></image>
+						</view>
+					</view>
+					
+					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(10-moveX/scale)+'px;top:109rpx;width:30rpx;'">
+						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff" :style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr"
+						 :key="mindex">{{m}}</view>
+						<view :style="'height: 20rpx;'"></view>
+					</view>
+
+				</movable-view>
+			</movable-area>
+			<view class="pt-f bottom-bar left-0 dp-f fd-cr z1000">
+				<view class="bg-white p-all-32">
+					<!-- <view class="dp-f ai-c jc-c fz-28 color-333 mb-20" v-if="SelectNum===0">
+						推荐选座
+						<view style="width: 106rpx;height: 60rpx;" class="b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(n,numindex) in 4"
+						 :key="n" @click="smartChoose(numindex+1)">
+							{{numindex+1}}人
+						</view>
+					</view> -->
+					<view class="dp-f ai-c fw-w fz-28 color-333 mb-20" v-if="SelectNum>0">
+						<text>已选</text>
+						<view class="p-all-10 b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(optItem,optindex) in optArr" :key="optindex">
+							{{optItem.seatNo}}
+						</view>
+					</view>
+					<view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'"
+					 @click="buySeat">
+						{{SelectNum>0?('￥ '+totalPrice+' 确认座位'):'请选座位'}}
+					</view>
+				</view>
+				<view class="dp-f jc-c ai-c mb-20 fz-28" v-if="showTis && seatSize!=0">
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/unselected.png" mode="aspectFit"></image><span
+						 class="ml-10">可选</span>
+					</view>
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/bought.png" mode="aspectFit"></image><span
+						 class="ml-10">不可选</span>
+					</view>
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/selected.png" mode="aspectFit"></image><span
+						 class="ml-10">选中</span>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	
+	import {
+		seatData
+	} from '@/utils/seat-data.js'
+	
+	import {
+		apiGetSchedSeatList,
+		apiSubmitOrder
+	} from '~/apis/movies'
+	export default {
+		data() {
+			return {
+				scaleMin:1,//h5端为解决1无法缩小问题，设为0.95
+				boxWidth: 400, //屏幕宽度px
+				space: ' ', //空格
+				seatArray: [], //影院座位的二维数组,-1为非座位，0为未购座位，1为已选座位(绿色),2为已购座位(红色),一维行，二维列
+				seatRow: 0, //影院座位行数
+				seatCol: 0, //影院座位列数
+				seatSize: 0, //座位尺寸
+				SelectNum: 0, //选择座位数
+				moveX: 0, //水平移动偏移量
+				scale: 1, //放大倍数
+				minRow: 0, //从第几行开始排座位
+				minCol: 0, //从第几列开始排座位
+				showTis: true, //显示选座提示
+				seatList: [], //接口获取的原始位置
+				mArr: [], //排数提示
+				optArr: [], //选中的座位数组。
+				isWXAPP:false,
+				relation_id:'',
+				sched_sign:'',
+				initInfo:'',
+				orgSeatList:[],
+				siginPrice:'',
+				channelSn:'',
+				totalPrice:0,
+				isFirstInit:true,
+				isCanClick:true
+			};
+		},
+		computed: {
+			// aPrice() {
+			// 	return (this.SelectNum * (this.siginPrice*100))/100
+			// },
+			rpxNum() {
+				return this.boxWidth / 750
+			},
+			pxNum() {
+				return 750 / this.boxWidth
+			},
+		},
+		
+		onLoad(e) {
+			this.initWidth()
+			if(e.info){
+				this.initInfo  = JSON.parse(decodeURIComponent(e.info))
+				this.getSeatList()
+			}
+		},
+		
+		onShow() {
+			if(!this.isFirstInit){
+				this.resetSeat()
+				this.getSeatList()
+			}
+			this.isFirstInit =false
+		},
+	
+		
+		methods: {
+			
+			initWidth(){
+				//获取宽度
+				let _this =this
+				uni.getSystemInfo({
+					success: function(e) {
+						_this.boxWidth = e.screenWidth
+						//#ifdef H5
+						_this.scaleMin = 0.95
+						//#endif
+					}
+				})
+			},
+			
+			 completeSeats(originalData) {
+			  // 1. 确定最大行号和列号
+			  let maxRow = 0, maxColumn = 0;
+			  originalData.forEach(rowArray => {
+			    rowArray.forEach(seat => {
+			      maxRow = Math.max(maxRow, parseInt(seat.rowNo));
+			      maxColumn = Math.max(maxColumn, parseInt(seat.columnNo));
+			    });
+			  });
+			   this.seatRow  = maxRow//数组长度
+			   this.seatCol  = maxColumn//子数组中长度最大的
+			  // 2. 按行号整理原始数据
+			  const rowMap = new Map();
+			  originalData.forEach(rowArray => {
+			    if (rowArray.length === 0) return;
+			    const rowNo = rowArray[0].rowNo;
+			    rowMap.set(rowNo, rowArray);
+			  });
+			
+			  // 3. 生成完整的行和列
+			  const result = [];
+			  for (let row = 1; row <= maxRow; row++) {
+			    const rowNo = row.toString();
+			    const currentRow = rowMap.get(rowNo) || [];
+			    const columnMap = new Map(currentRow.map(seat => [seat.columnNo, seat]));
+			
+			    // 生成当前排的完整列数据
+			    const completedColumns = Array.from({ length: maxColumn }, (_, colIdx) => {
+			      const columnNo = (colIdx + 1).toString();
+			      return columnMap.has(columnNo) 
+			        ? columnMap.get(columnNo) 
+			        : { 
+			            supplier_id: null, 
+			            seatNo: `${rowNo}排${columnNo.padStart(2, '0')}座`, 
+			            rowNo, 
+			            columnNo ,
+						status:-1
+			          };
+			    });
+				
+			    result.push(completedColumns);
+			  }
+			
+			  return result;
+			},
+		
+			getSeatList(){
+				uni.showLoading()
+				let params = `relation_id=${this.initInfo.relation_id}&sched_sign=${this.initInfo.sched_sign}`
+				apiGetSchedSeatList(params).then(res => {
+					this.orgSeatList = res
+					if(res.length!=0){
+						this.seatArray = this.completeSeats(this.orgSeatList)
+						this.initSeatArray()
+						uni.hideLoading()
+					}else{
+						uni.showToast({
+							title:'未获取到座位数据',
+							icon:'none'
+						})
+					}
+			     
+				})
+			},
+			
+			submitOrder(){
+				if(!this.isCanClick){
+					return
+				}
+				this.isCanClick=false
+				uni.showLoading({
+					title:'处理中...',
+					mask:true
+				})
+			let _newArr=this.optArr.map((res)=>{
+					return {seat_no:res.seatNo,seat_sign:res.seatSign,channel_sn:res.channel_sn}
+				})
+				
+				let params ={
+					sched_sign:this.initInfo.sched_sign,
+					channel_sn:_newArr[0].channel_sn,
+					sched_seat:JSON.stringify(_newArr),
+					hall_sign:this.initInfo.hall_sign,
+					hall_name:this.initInfo.hall_name,
+					show_date:this.initInfo.show_date,
+					show_time:this.initInfo.show_time,
+					cinema_sign:this.initInfo.cinema_sign,
+					phone:uni.getStorageSync('USER_INFO_PHONE'),
+					
+					film_sign:this.initInfo.film_sign,
+					relation_id:this.initInfo.relation_id,
+				}
+				apiSubmitOrder(params).then(res => {
+					uni.hideLoading()
+					uni.navigateTo({
+						url:`/subPages/pages/movies/moviesOrder?order_sn=${res.order_sn}&oid=${res.oid}&code=${res.code}&type=${res.type}`
+					})
+				}).catch((e)=>{
+					console.log("===e",e);
+					this.isCanClick=true
+			    uni.showToast({
+				title:e ||'接口异常!',
+				icon:'none'
+			})
+		})
+			},
+			
+			//初始座位数组
+			initSeatArray() {
+				this.seatSize = this.boxWidth > 0 ?
+					parseInt(parseInt(this.boxWidth, 10) / (this.seatCol + 3), 10) :
+					parseInt(parseInt(414, 10) / (this.seatCol + 3), 10)
+				   this.initNonSeatPlace();
+			},
+			
+			//初始化是座位的地方
+			initNonSeatPlace() {
+				let mArr = []
+				for (var i = 0; i <this.seatArray.length; i++) {
+					let _item = this.seatArray[i]
+					let _name =''
+					for (var j = 0; j < _item.length; j++) {
+						let childItem = _item[j]
+						if (childItem.status!=-1 ) {
+							//this.siginPrice = childItem.price
+							this.channelSn =childItem.channel_sn
+							if(childItem.seatNo.indexOf('排')!= -1){
+								_name= childItem.seatNo.split('排')[0]
+							}else{
+								_name= childItem.rowNo
+							}
+							break
+						} 
+					}
+					mArr.push(_name)
+				}
+				this.mArr = mArr
+			},
+			//放大缩小事件
+			onScale(e) {
+				this.showTis = false
+				// this.moveX=-e.detail.x
+				let w = this.boxWidth * 0.5
+				let s = 1 - e.detail.scale
+				this.moveX = w * s
+				this.scale = e.detail.scale
+				if (s > 0 || s === 0) {
+					this.showTis = true
+				}
+			},
+			//移动事件
+			onMove(e) {
+				this.showTis = false
+				this.moveX = e.detail.x
+			},
+			//重置座位
+			resetSeat() {
+				this.totalPrice=0
+				this.SelectNum = 0
+				this.optArr = []
+				//将所有已选座位的值变为0
+				let oldArray = this.seatArray.slice();
+				for (let i = 0; i < this.seatRow; i++) {
+					for (let j = 0; j < this.seatCol; j++) {
+						if (oldArray[i][j].status === 2) {
+							oldArray[i][j].status = 1
+						}
+					}
+				}
+				this.seatArray = oldArray;
+			},
+			//选定且购买座位
+			buySeat() {
+				if (this.SelectNum === 0) {
+					return
+				}
+				let _this =this
+				for (let i = 0; i < this.optArr.length; i++) {
+					let _price = this.optArr[0].price
+					if(_price != this.optArr[i].price){
+						uni.showModal({
+							title:'温馨提示',
+							content:'请选择相同价格的座位,暂不支持不同价格的座位同时下单，如有需要请单独选择座位下单~',
+							complete: (res) => {
+								_this.resetSeat()
+							}
+						})
+						return
+					}
+				}
+				this.submitOrder()
+			},
+			
+			
+			//处理座位选择逻辑
+			handleChooseSeat(row, col) {
+				let seatValue = this.seatArray[row][col].status;
+				let newArray = this.seatArray;
+				//情侣座处理，基数加1 偶数减1
+				//如果是已购座位，直接返回
+				if (seatValue === 0 || seatValue === -1) return
+				//如果是已选座位点击后变未选
+				if (seatValue === 2) {
+					newArray[row][col].status = 1
+					this.SelectNum--
+					this.getOptArr(newArray[row][col], 0)
+					this.totalPrice = (parseFloat(this.totalPrice )*100- parseFloat(newArray[row][col].price)*100)/100
+				} else if (seatValue === 1) {
+					if(this.SelectNum==4){
+						uni.showToast({
+							title:'每次最多只能选择4个座位',
+							icon:'none'
+						})
+						return
+					}
+					newArray[row][col].status =2
+					this.totalPrice = ( parseFloat(this.totalPrice )*100 +  parseFloat(newArray[row][col].price)*100)/100
+					this.SelectNum++
+					this.getOptArr(newArray[row][col], 1)
+				}
+				//必须整体更新二维数组，Vue无法检测到数组某一项更新,必须slice复制一个数组才行
+				this.seatArray = newArray.slice();
+			
+			},
+			//处理已选座位数组
+			getOptArr(item, type) {
+				let optArr = this.optArr
+				if (type === 1) {
+					optArr.push(item)
+				} else if (type === 0) {
+					let arr = []
+					optArr.forEach(v => {
+						if (v.seatSign !== item.seatSign) {
+							arr.push(v)
+						}
+					})
+					optArr = arr
+				}
+				this.optArr = optArr.slice()
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.p-all-10{
+		padding: 10rpx;
+	}
+	.ml-10 {
+		margin-left: 10rpx;
+	}
+
+	.m-0-10 {
+		margin: 0 10rpx;
+	}
+
+	.bg-unbtn {
+		background-color: #f9abb3;
+	}
+
+	.bg-red-1 {
+		background-color: #F45664;
+	}
+
+	.br-10 {
+		border-radius: 10rpx;
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.mb-20 {
+		margin-bottom: 20rpx;
+	}
+
+	.p-all-32 {
+		padding: 32rpx;
+	}
+
+	.fd-cr {
+		flex-direction: column-reverse;
+		/* 主轴方向从下到上,默认从左到右 */
+	}
+
+	.bottom-bar {
+		bottom: var(--window-bottom);
+	}
+
+	.color-fff {
+		color: #fff
+	}
+
+	.br-15 {
+		border-radius: 15rpx;
+	}
+
+	.over-h {
+		overflow: hidden;
+	}
+
+	.dp-ib {
+		display: inline-block;
+	}
+
+	.mt-20 {
+		margin-top: 20rpx;
+	}
+
+	.pa-v-2 {
+		/* 定位垂直对齐 */
+		left: 50%;
+		transform: translateX(-50%)
+	}
+
+	.b-d-1 {
+		border: 1px dashed #e5e5e5;
+	}
+
+	.w-100 {
+		width: 100%;
+	}
+
+	.h-100 {
+		height: 100%;
+	}
+
+	.bg-f1 {
+		background-color: #f1f1f1;
+	}
+
+	.h-100vh {
+		height: 100vh;
+	}
+
+	.pt-f {
+		position: fixed;
+	}
+
+	.left-0 {
+		left: 0;
+	}
+
+	.p-0-32 {
+		padding: 0 32rpx;
+	}
+
+	.pt-20 {
+		padding-top: 20rpx;
+	}
+
+	.bg-white {
+		background-color: #fff;
+	}
+
+	.z1000 {
+		z-index: 1000;
+	}
+
+	.fz-34 {
+		font-size: 34rpx;
+	}
+
+	.fw-b {
+		font-weight: bold;
+	}
+
+	.mt-10 {
+		margin-top: 10rpx;
+	}
+
+	.fz-28 {
+		font-size: 28rpx;
+	}
+
+	.color-666 {
+		color: #666666
+	}
+
+	.dp-f {
+		display: flex;
+	}
+
+	.jc-c {
+		justify-content: center;
+	}
+
+	.ai-c {
+		align-items: center;
+	}
+
+	.fz-22 {
+		font-size: 22rpx;
+	}
+
+	.color-333 {
+		color: #333333
+	}
+
+	.m-0-a {
+		margin: 0 auto;
+	}
+
+	.mt-48 {
+		margin-top: 48rpx;
+	}
+
+	.fz-20 {
+		font-size: 20rpx;
+	}
+
+	.color-999 {
+		color: #999999
+	}
+
+	.b-1 {
+		border: 1px solid #CCCCCC;
+	}
+
+	.br-5 {
+		border-radius: 5rpx;
+	}
+
+	.Stage {
+		background-color: #dddddd;
+		width: 380rpx;
+		height: 50rpx;
+		transform: perspective(50rpx) rotateX(-10deg);
+		margin: 0 auto;
+	}
+
+	.bg-line {
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.sel-seat {
+		background: url('/static/selected.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+	
+	.unsel-seat {
+		background: url('/static/unselected.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+	
+	.bought-seat {
+		background: url('/static/bought.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 选择座位
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/movies/chooseSeat.vue

@@ -0,0 +1,619 @@
+<template>
+	<view class="w-100">
+		<view class="bg-f1 h-100vh">
+			<view class="pt-f left-0 w-100 p-0-32 bg-white z1000" :style="'height: 132rpx;top:0'">
+				<view>
+					<view class="fz-34 fw-b pt-20">
+						{{initInfo.film_name}}
+					</view>
+					<view class="mt-10 fz-28 color-666">
+						{{initInfo.show_des}}
+					</view>
+				</view>
+			</view>
+			<movable-area :style="'height:'+(seatRow*40+350)+'rpx;width: 100vw;top:'+(rpxNum*132)+'px'" class="pt-f left-0">
+				<movable-view :style="'width: 100vw;height:'+(seatRow*40+350)+'rpx;'" :inertia="true" :scale="true" :scale-min="0.95"
+				 :scale-max="2" direction="all" @change="onMove" @scale="onScale">
+					<view class="Stage dp-f jc-c ai-c fz-22 color-333">
+						{{initInfo.hall_name}}
+					</view>
+					<view style="width: 100rpx;height: 30rpx;" class="m-0-a mt-48 dp-f jc-c ai-c fz-20 color-999 b-1 br-5">银幕中央</view>
+					
+					<view class="pt-f pa-v-2 b-d-1" :style="'height:'+seatRow*(20+seatSize*pxNum)+'rpx;top:165rpx;width:0'"></view>
+					
+					<view v-for="(item,index) in seatArray" :key="index" class="dp-f jc-c mt-20" :style="'width:'+boxWidth+'px;height:'+seatSize+'px'">
+						<view v-for="(seat,col) in item" :key="col" class="dp-ib" :style="'width:'+seatSize+'px;height:'+seatSize+'px'"
+						 @click="handleChooseSeat(index,col)">
+							<image v-if="seat.status===1" class="w-100 h-100" src="../../static/unselected.png" mode="aspectFit"></image>
+							<image v-else-if="seat.status===2" class="w-100 h-100" src="../../static/selected.png" mode="aspectFit"></image>
+							<image v-else-if="seat.status===0" class="w-100 h-100" src="../../static/bought.png" mode="aspectFit"></image>
+						</view>
+					</view>
+					
+					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(10-moveX/scale)+'px;top:109rpx;width:30rpx;'">
+						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff" :style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr"
+						 :key="mindex">{{m}}</view>
+						<view :style="'height: 20rpx;'"></view>
+					</view>
+
+				</movable-view>
+			</movable-area>
+			<view class="pt-f bottom-bar left-0 dp-f fd-cr z1000">
+				<view class="bg-white p-all-32">
+					<!-- <view class="dp-f ai-c jc-c fz-28 color-333 mb-20" v-if="SelectNum===0">
+						推荐选座
+						<view style="width: 106rpx;height: 60rpx;" class="b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(n,numindex) in 4"
+						 :key="n" @click="smartChoose(numindex+1)">
+							{{numindex+1}}人
+						</view>
+					</view> -->
+					<view class="dp-f ai-c fw-w fz-28 color-333 mb-20" v-if="SelectNum>0">
+						<text>已选</text>
+						<view class="p-all-10 b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(optItem,optindex) in optArr" :key="optindex">
+							{{optItem.seatNo}}
+						</view>
+					</view>
+					<view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'"
+					 @click="buySeat">
+						{{SelectNum>0?('￥ '+totalPrice+' 确认座位'):'请选座位'}}
+					</view>
+				</view>
+				<view class="dp-f jc-c ai-c mb-20 fz-28" v-if="showTis && seatSize!=0">
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/unselected.png" mode="aspectFit"></image><span
+						 class="ml-10">可选</span>
+					</view>
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/bought.png" mode="aspectFit"></image><span
+						 class="ml-10">不可选</span>
+					</view>
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/selected.png" mode="aspectFit"></image><span
+						 class="ml-10">选中</span>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	
+	import {
+		seatData
+	} from '@/utils/seat-data.js'
+	
+	import {
+		apiGetSchedSeatList,
+		apiSubmitOrder
+	} from '~/apis/movies'
+	export default {
+		data() {
+			return {
+				scaleMin:1,//h5端为解决1无法缩小问题，设为0.95
+				boxWidth: 400, //屏幕宽度px
+				space: ' ', //空格
+				seatArray: [], //影院座位的二维数组,-1为非座位，0为未购座位，1为已选座位(绿色),2为已购座位(红色),一维行，二维列
+				seatRow: 0, //影院座位行数
+				seatCol: 0, //影院座位列数
+				seatSize: 0, //座位尺寸
+				SelectNum: 0, //选择座位数
+				moveX: 0, //水平移动偏移量
+				scale: 1, //放大倍数
+				minRow: 0, //从第几行开始排座位
+				minCol: 0, //从第几列开始排座位
+				showTis: true, //显示选座提示
+				seatList: [], //接口获取的原始位置
+				mArr: [], //排数提示
+				optArr: [], //选中的座位数组。
+				isWXAPP:false,
+				relation_id:'',
+				sched_sign:'',
+				initInfo:'',
+				orgSeatList:[],
+				siginPrice:'',
+				channelSn:'',
+				totalPrice:0,
+				isFirstInit:true,
+				isCanClick:true
+			};
+		},
+		computed: {
+			// aPrice() {
+			// 	return (this.SelectNum * (this.siginPrice*100))/100
+			// },
+			rpxNum() {
+				return this.boxWidth / 750
+			},
+			pxNum() {
+				return 750 / this.boxWidth
+			},
+		},
+		
+		onLoad(e) {
+			this.initWidth()
+			if(e.info){
+				this.initInfo  = JSON.parse(decodeURIComponent(e.info))
+				this.getSeatList()
+			}
+		},
+		
+		onShow() {
+			if(!this.isFirstInit){
+				this.resetSeat()
+				this.getSeatList()
+			}
+			this.isFirstInit =false
+		},
+	
+		
+		methods: {
+			
+			initWidth(){
+				//获取宽度
+				let _this =this
+				uni.getSystemInfo({
+					success: function(e) {
+						_this.boxWidth = e.screenWidth
+						//#ifdef H5
+						_this.scaleMin = 0.95
+						//#endif
+					}
+				})
+			},
+			
+			 completeSeats(originalData) {
+			  // 1. 确定最大行号和列号
+			  let maxRow = 0, maxColumn = 0;
+			  originalData.forEach(rowArray => {
+			    rowArray.forEach(seat => {
+			      maxRow = Math.max(maxRow, parseInt(seat.rowNo));
+			      maxColumn = Math.max(maxColumn, parseInt(seat.columnNo));
+			    });
+			  });
+			   this.seatRow  = maxRow//数组长度
+			   this.seatCol  = maxColumn//子数组中长度最大的
+			  // 2. 按行号整理原始数据
+			  const rowMap = new Map();
+			  originalData.forEach(rowArray => {
+			    if (rowArray.length === 0) return;
+			    const rowNo = rowArray[0].rowNo;
+			    rowMap.set(rowNo, rowArray);
+			  });
+			
+			  // 3. 生成完整的行和列
+			  const result = [];
+			  for (let row = 1; row <= maxRow; row++) {
+			    const rowNo = row.toString();
+			    const currentRow = rowMap.get(rowNo) || [];
+			    const columnMap = new Map(currentRow.map(seat => [seat.columnNo, seat]));
+			
+			    // 生成当前排的完整列数据
+			    const completedColumns = Array.from({ length: maxColumn }, (_, colIdx) => {
+			      const columnNo = (colIdx + 1).toString();
+			      return columnMap.has(columnNo) 
+			        ? columnMap.get(columnNo) 
+			        : { 
+			            supplier_id: null, 
+			            seatNo: `${rowNo}排${columnNo.padStart(2, '0')}座`, 
+			            rowNo, 
+			            columnNo ,
+						status:-1
+			          };
+			    });
+				
+			    result.push(completedColumns);
+			  }
+			
+			  return result;
+			},
+		
+			getSeatList(){
+				uni.showLoading()
+				let params = `relation_id=${this.initInfo.relation_id}&sched_sign=${this.initInfo.sched_sign}`
+				apiGetSchedSeatList(params).then(res => {
+					this.orgSeatList = res
+					if(res.length!=0){
+						this.seatArray = this.completeSeats(this.orgSeatList)
+						this.initSeatArray()
+						uni.hideLoading()
+					}else{
+						uni.showToast({
+							title:'未获取到座位数据',
+							icon:'none'
+						})
+					}
+			     
+				})
+			},
+			
+			submitOrder(){
+				if(!this.isCanClick){
+					return
+				}
+				this.isCanClick=false
+				uni.showLoading({
+					title:'处理中...',
+					mask:true
+				})
+			let _newArr=this.optArr.map((res)=>{
+					return {seat_no:res.seatNo,seat_sign:res.seatSign,channel_sn:res.channel_sn}
+				})
+				
+				let params ={
+					sched_sign:this.initInfo.sched_sign,
+					channel_sn:_newArr[0].channel_sn,
+					sched_seat:JSON.stringify(_newArr),
+					hall_sign:this.initInfo.hall_sign,
+					hall_name:this.initInfo.hall_name,
+					show_date:this.initInfo.show_date,
+					show_time:this.initInfo.show_time,
+					cinema_sign:this.initInfo.cinema_sign,
+					phone:uni.getStorageSync('USER_INFO_PHONE'),
+					
+					film_sign:this.initInfo.film_sign,
+					relation_id:this.initInfo.relation_id,
+				}
+				apiSubmitOrder(params).then(res => {
+					uni.hideLoading()
+					uni.navigateTo({
+						url:`/subPages/pages/movies/moviesOrder?order_sn=${res.order_sn}&oid=${res.oid}&code=${res.code}&type=${res.type}`
+					})
+				}).catch((e)=>{
+					console.log("===e",e);
+					this.isCanClick=true
+			    uni.showToast({
+				title:e ||'接口异常!',
+				icon:'none'
+			})
+		})
+			},
+			
+			//初始座位数组
+			initSeatArray() {
+				this.seatSize = this.boxWidth > 0 ?
+					parseInt(parseInt(this.boxWidth, 10) / (this.seatCol + 3), 10) :
+					parseInt(parseInt(414, 10) / (this.seatCol + 3), 10)
+				   this.initNonSeatPlace();
+			},
+			
+			//初始化是座位的地方
+			initNonSeatPlace() {
+				let mArr = []
+				for (var i = 0; i <this.seatArray.length; i++) {
+					let _item = this.seatArray[i]
+					let _name =''
+					for (var j = 0; j < _item.length; j++) {
+						let childItem = _item[j]
+						if (childItem.status!=-1 ) {
+							//this.siginPrice = childItem.price
+							this.channelSn =childItem.channel_sn
+							if(childItem.seatNo.indexOf('排')!= -1){
+								_name= childItem.seatNo.split('排')[0]
+							}else{
+								_name= childItem.rowNo
+							}
+							break
+						} 
+					}
+					mArr.push(_name)
+				}
+				this.mArr = mArr
+			},
+			//放大缩小事件
+			onScale(e) {
+				this.showTis = false
+				// this.moveX=-e.detail.x
+				let w = this.boxWidth * 0.5
+				let s = 1 - e.detail.scale
+				this.moveX = w * s
+				this.scale = e.detail.scale
+				if (s > 0 || s === 0) {
+					this.showTis = true
+				}
+			},
+			//移动事件
+			onMove(e) {
+				this.showTis = false
+				this.moveX = e.detail.x
+			},
+			//重置座位
+			resetSeat() {
+				this.totalPrice=0
+				this.SelectNum = 0
+				this.optArr = []
+				//将所有已选座位的值变为0
+				let oldArray = this.seatArray.slice();
+				for (let i = 0; i < this.seatRow; i++) {
+					for (let j = 0; j < this.seatCol; j++) {
+						if (oldArray[i][j].status === 2) {
+							oldArray[i][j].status = 1
+						}
+					}
+				}
+				this.seatArray = oldArray;
+			},
+			//选定且购买座位
+			buySeat() {
+				if (this.SelectNum === 0) {
+					return
+				}
+				let _this =this
+				for (let i = 0; i < this.optArr.length; i++) {
+					let _price = this.optArr[0].price
+					if(_price != this.optArr[i].price){
+						uni.showModal({
+							title:'温馨提示',
+							content:'请选择相同价格的座位,暂不支持不同价格的座位同时下单，如有需要请单独选择座位下单~',
+							complete: (res) => {
+								_this.resetSeat()
+							}
+						})
+						return
+					}
+				}
+				this.submitOrder()
+			},
+			
+			
+			//处理座位选择逻辑
+			handleChooseSeat(row, col) {
+				let seatValue = this.seatArray[row][col].status;
+				let newArray = this.seatArray;
+				//情侣座处理，基数加1 偶数减1
+				//如果是已购座位，直接返回
+				if (seatValue === 0 || seatValue === -1) return
+				//如果是已选座位点击后变未选
+				if (seatValue === 2) {
+					newArray[row][col].status = 1
+					this.SelectNum--
+					this.getOptArr(newArray[row][col], 0)
+					this.totalPrice = (parseFloat(this.totalPrice )*100- parseFloat(newArray[row][col].price)*100)/100
+				} else if (seatValue === 1) {
+					if(this.SelectNum==4){
+						uni.showToast({
+							title:'每次最多只能选择4个座位',
+							icon:'none'
+						})
+						return
+					}
+					newArray[row][col].status =2
+					this.totalPrice = ( parseFloat(this.totalPrice )*100 +  parseFloat(newArray[row][col].price)*100)/100
+					this.SelectNum++
+					this.getOptArr(newArray[row][col], 1)
+				}
+				//必须整体更新二维数组，Vue无法检测到数组某一项更新,必须slice复制一个数组才行
+				this.seatArray = newArray.slice();
+			
+			},
+			//处理已选座位数组
+			getOptArr(item, type) {
+				let optArr = this.optArr
+				if (type === 1) {
+					optArr.push(item)
+				} else if (type === 0) {
+					let arr = []
+					optArr.forEach(v => {
+						if (v.seatSign !== item.seatSign) {
+							arr.push(v)
+						}
+					})
+					optArr = arr
+				}
+				this.optArr = optArr.slice()
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.p-all-10{
+		padding: 10rpx;
+	}
+	.ml-10 {
+		margin-left: 10rpx;
+	}
+
+	.m-0-10 {
+		margin: 0 10rpx;
+	}
+
+	.bg-unbtn {
+		background-color: #f9abb3;
+	}
+
+	.bg-red-1 {
+		background-color: #F45664;
+	}
+
+	.br-10 {
+		border-radius: 10rpx;
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.mb-20 {
+		margin-bottom: 20rpx;
+	}
+
+	.p-all-32 {
+		padding: 32rpx;
+	}
+
+	.fd-cr {
+		flex-direction: column-reverse;
+		/* 主轴方向从下到上,默认从左到右 */
+	}
+
+	.bottom-bar {
+		bottom: var(--window-bottom);
+	}
+
+	.color-fff {
+		color: #fff
+	}
+
+	.br-15 {
+		border-radius: 15rpx;
+	}
+
+	.over-h {
+		overflow: hidden;
+	}
+
+	.dp-ib {
+		display: inline-block;
+	}
+
+	.mt-20 {
+		margin-top: 20rpx;
+	}
+
+	.pa-v-2 {
+		/* 定位垂直对齐 */
+		left: 50%;
+		transform: translateX(-50%)
+	}
+
+	.b-d-1 {
+		border: 1px dashed #e5e5e5;
+	}
+
+	.w-100 {
+		width: 100%;
+	}
+
+	.h-100 {
+		height: 100%;
+	}
+
+	.bg-f1 {
+		background-color: #f1f1f1;
+	}
+
+	.h-100vh {
+		height: 100vh;
+	}
+
+	.pt-f {
+		position: fixed;
+	}
+
+	.left-0 {
+		left: 0;
+	}
+
+	.p-0-32 {
+		padding: 0 32rpx;
+	}
+
+	.pt-20 {
+		padding-top: 20rpx;
+	}
+
+	.bg-white {
+		background-color: #fff;
+	}
+
+	.z1000 {
+		z-index: 1000;
+	}
+
+	.fz-34 {
+		font-size: 34rpx;
+	}
+
+	.fw-b {
+		font-weight: bold;
+	}
+
+	.mt-10 {
+		margin-top: 10rpx;
+	}
+
+	.fz-28 {
+		font-size: 28rpx;
+	}
+
+	.color-666 {
+		color: #666666
+	}
+
+	.dp-f {
+		display: flex;
+	}
+
+	.jc-c {
+		justify-content: center;
+	}
+
+	.ai-c {
+		align-items: center;
+	}
+
+	.fz-22 {
+		font-size: 22rpx;
+	}
+
+	.color-333 {
+		color: #333333
+	}
+
+	.m-0-a {
+		margin: 0 auto;
+	}
+
+	.mt-48 {
+		margin-top: 48rpx;
+	}
+
+	.fz-20 {
+		font-size: 20rpx;
+	}
+
+	.color-999 {
+		color: #999999
+	}
+
+	.b-1 {
+		border: 1px solid #CCCCCC;
+	}
+
+	.br-5 {
+		border-radius: 5rpx;
+	}
+
+	.Stage {
+		background-color: #dddddd;
+		width: 380rpx;
+		height: 50rpx;
+		transform: perspective(50rpx) rotateX(-10deg);
+		margin: 0 auto;
+	}
+
+	.bg-line {
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.sel-seat {
+		background: url('/static/selected.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+	
+	.unsel-seat {
+		background: url('/static/unselected.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+	
+	.bought-seat {
+		background: url('/static/bought.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 选择座位
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/movies/chooseSeat1.vue

@@ -0,0 +1,753 @@
+<template>
+	<view class="w-100">
+		<view class="bg-f1 h-100vh">
+			<view class="pt-f left-0 w-100 p-0-32 bg-white z1000" :style="'height: 132rpx;top:0'">
+				<view>
+					<view class="fz-34 fw-b pt-20">
+						{{initInfo.film_name}}
+					</view>
+					<view class="mt-10 fz-28 color-666">
+						{{initInfo.show_des}}
+					</view>
+				</view>
+			</view>
+			<movable-area :style="'height:'+(seatRow*40+350)+'rpx;width: 100vw;top:'+(rpxNum*132)+'px'" class="pt-f left-0">
+				<movable-view :style="'width: 100vw;height:'+(seatRow*40+350)+'rpx;'" :inertia="true" :scale="true" :scale-min="0.95"
+				 :scale-max="2" direction="all" @change="onMove" @scale="onScale">
+					<view class="Stage dp-f jc-c ai-c fz-22 color-333">
+						{{initInfo.hall_name}}
+					</view>
+					<view style="width: 100rpx;height: 30rpx;" class="m-0-a mt-48 dp-f jc-c ai-c fz-20 color-999 b-1 br-5">银幕中央</view>
+					
+					<view class="pt-f pa-v-2 b-d-1" :style="'height:'+seatRow*(20+seatSize*pxNum)+'rpx;top:165rpx;width:0'"></view>
+					
+					<view v-for="(item,index) in seatArray" :key="index" class="dp-f jc-c mt-20" :style="'width:'+boxWidth+'px;height:'+seatSize+'px'">
+						<view v-for="(seat,col) in item" :key="col" class="dp-ib" :style="'width:'+seatSize+'px;height:'+seatSize+'px'"
+						 @click="handleChooseSeat(index,col)">
+							<image v-if="seat.type===0" class="w-100 h-100" src="../../static/unselected.png" mode="aspectFit"></image>
+							<image v-else-if="seat.type===1" class="w-100 h-100" src="../../static/selected.png" mode="aspectFit"></image>
+							<image v-else-if="seat.type===2" class="w-100 h-100" src="../../static/bought.png" mode="aspectFit"></image>
+						</view>
+					</view>
+					
+					<view class="pt-f bg-line br-15 over-h" :style="'left: '+(10-moveX/scale)+'px;top:109rpx;width:30rpx;'">
+						<view class="w-100 dp-f ai-c jc-c fz-22 color-fff" :style="'height:'+seatSize+'px;margin-top:20rpx;'" v-for="(m,mindex) in mArr"
+						 :key="mindex">{{m}}</view>
+						<view :style="'height: 20rpx;'"></view>
+					</view>
+
+				</movable-view>
+			</movable-area>
+			<view class="pt-f bottom-bar left-0 dp-f fd-cr z1000">
+				<view class="bg-white p-all-32">
+					<!-- <view class="dp-f ai-c jc-c fz-28 color-333 mb-20" v-if="SelectNum===0">
+						推荐选座
+						<view style="width: 106rpx;height: 60rpx;" class="b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(n,numindex) in 4"
+						 :key="n" @click="smartChoose(numindex+1)">
+							{{numindex+1}}人
+						</view>
+					</view> -->
+					<view class="dp-f ai-c fw-w fz-28 color-333 mb-20" v-if="SelectNum>0">
+						<text>已选</text>
+						<view class="p-all-10 b-1 br-5 dp-f ai-c jc-c fz-28 ml-20" v-for="(optItem,optindex) in optArr" :key="optindex">
+							{{optItem.RowNum+'排'+optItem.ColumnNum+'座'}}
+						</view>
+					</view>
+					<view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'"
+					 @click="buySeat">
+						{{SelectNum>0?('￥ '+aPrice+' 确认座位'):'请选座位'}}
+					</view>
+				</view>
+				<view class="dp-f jc-c ai-c mb-20 fz-28" v-if="showTis">
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/unselected.png" mode="aspectFit"></image><span
+						 class="ml-10">可选</span>
+					</view>
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/bought.png" mode="aspectFit"></image><span
+						 class="ml-10">不可选</span>
+					</view>
+					<view class="dp-f jc-c ai-c m-0-10">
+						<image :style="'width:'+seatSize+'px;height:'+seatSize+'px'" src="/static/selected.png" mode="aspectFit"></image><span
+						 class="ml-10">选中</span>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	
+	import {
+		seatData
+	} from '@/utils/seat-data.js'
+	
+	import {
+		apiGetSchedSeatList,
+	} from '~/apis/movies'
+	export default {
+		data() {
+			return {
+				scaleMin:1,//h5端为解决1无法缩小问题，设为0.95
+				boxWidth: 400, //屏幕宽度px
+				space: ' ', //空格
+				seatArray: [], //影院座位的二维数组,-1为非座位，0为未购座位，1为已选座位(绿色),2为已购座位(红色),一维行，二维列
+				seatRow: 0, //影院座位行数
+				seatCol: 0, //影院座位列数
+				seatSize: 0, //座位尺寸
+				SelectNum: 0, //选择座位数
+				moveX: 0, //水平移动偏移量
+				scale: 1, //放大倍数
+				minRow: 0, //从第几行开始排座位
+				minCol: 0, //从第几列开始排座位
+				showTis: true, //显示选座提示
+				seatList: [], //接口获取的原始位置
+				mArr: [], //排数提示
+				optArr: [], //选中的座位数组。
+				isWXAPP:false,
+				relation_id:'',
+				sched_sign:'',
+				initInfo:'',
+				orgSeatList:[]
+			};
+		},
+		computed: {
+			aPrice() {
+				return this.SelectNum * 36
+			},
+			rpxNum() {
+				return this.boxWidth / 750
+			},
+			pxNum() {
+				return 750 / this.boxWidth
+			},
+		},
+		
+		onLoad(e) {
+			//relation_id=${item.relation_id}&sched_sign=${item.sched_sign}`
+			console.log("===onLoad",e);
+			
+			if(e.info){
+				this.initInfo  = JSON.parse(decodeURIComponent(e.info))
+			}
+			//获取宽度
+			let _this =this
+			uni.getSystemInfo({
+				success: function(e) {
+					_this.boxWidth = e.screenWidth
+					//#ifdef H5
+					_this.scaleMin = 0.95
+					//#endif
+				}
+			})
+			this.initData()
+			//this.getSeatList()
+		},
+		methods: {
+			
+			 completeSeats(originalData) {
+			  // 1. 确定最大行号和列号
+			  let maxRow = 0, maxColumn = 0;
+			  originalData.forEach(rowArray => {
+			    rowArray.forEach(seat => {
+			      maxRow = Math.max(maxRow, parseInt(seat.rowNo));
+			      maxColumn = Math.max(maxColumn, parseInt(seat.columnNo));
+			    });
+			  });
+			   this.seatRow  = maxRow//数组长度
+			   this.seatCol  = maxColumn//子数组中长度最大的
+			  // 2. 按行号整理原始数据
+			  const rowMap = new Map();
+			  originalData.forEach(rowArray => {
+			    if (rowArray.length === 0) return;
+			    const rowNo = rowArray[0].rowNo;
+			    rowMap.set(rowNo, rowArray);
+			  });
+			
+			  // 3. 生成完整的行和列
+			  const result = [];
+			  for (let row = 1; row <= maxRow; row++) {
+			    const rowNo = row.toString();
+			    const currentRow = rowMap.get(rowNo) || [];
+			    const columnMap = new Map(currentRow.map(seat => [seat.columnNo, seat]));
+			
+			    // 生成当前排的完整列数据
+			    const completedColumns = Array.from({ length: maxColumn }, (_, colIdx) => {
+			      const columnNo = (colIdx + 1).toString();
+			      return columnMap.has(columnNo) 
+			        ? columnMap.get(columnNo) 
+			        : { 
+			            supplier_id: null, 
+			            seatNo: `${rowNo}排${columnNo.padStart(2, '0')}座`, 
+			            rowNo, 
+			            columnNo ,
+						status:-1
+			          };
+			    });
+			    result.push(completedColumns);
+			  }
+			
+			  return result;
+			},
+			initData() {
+			
+				
+				let arr = seatData
+				//假数据说明：SeatCode座位编号，RowNum-行号，ColumnNum-纵号，YCoord-Y坐标，XCoord-X坐标，Status-状态
+				let row = 0
+				let col = 0
+				let minCol = parseInt(arr[0].XCoord)
+				let minRow = parseInt(arr[0].YCoord)
+				for (let i of arr) {
+					minRow = parseInt(i.YCoord) < minRow ? parseInt(i.YCoord) : minRow
+					minCol = parseInt(i.XCoord) < minCol ? parseInt(i.XCoord) : minCol
+					row = parseInt(i.YCoord) > row ? parseInt(i.YCoord) : row
+					col = parseInt(i.XCoord) > col ? parseInt(i.XCoord) : col
+				}
+				this.seatList = arr
+				this.seatRow = row - minRow + 1
+				this.seatCol = col - minCol + 3
+				this.minRow = minRow
+				this.minCol = minCol - 1
+				console.log("===this.seatRow--initData",this.seatList);
+				console.log("===this.seatRow",this.seatRow);
+                console.log("===this.seatCol",this.seatCol);
+				console.log("===minRow",this.minRow);
+				console.log("===minCol",this.minCol);
+				this.initSeatArray()
+			},
+			
+			getSeatList(){
+				uni.showLoading()
+				let params = `relation_id=${this.initInfo.relation_id}&sched_sign=${this.initInfo.sched_sign}`
+				apiGetSchedSeatList(params).then(res => {
+					console.log("===getSeatList",res);
+					this.orgSeatList = res
+				 
+				let _arr = 	this.completeSeats(this.orgSeatList)
+				console.log("===getSeatList",_arr);
+			
+					//this.initSeatArray()
+					uni.hideLoading()
+				})
+			},
+			//初始座位数组
+			initSeatArray: function() {
+				
+				
+				
+				let seatArray = Array(this.seatRow).fill(0).map(() => Array(this.seatCol).fill({
+					type: -1,
+					SeatCode: '',
+					RowNum: '',
+					ColumnNum: ''
+				}));
+					console.log("===this.seatArray",seatArray);
+				this.seatArray = seatArray
+				console.log("===this.seatArray",this.seatArray);
+				this.seatSize = this.boxWidth > 0 ?
+					parseInt(parseInt(this.boxWidth, 10) / (this.seatCol + 1), 10) :
+					parseInt(parseInt(414, 10) / (this.seatCol + 1), 10)
+				this.initNonSeatPlace();
+			},
+			
+			//初始化是座位的地方
+			initNonSeatPlace: function() {
+				let seat = this.seatList.slice()
+				let arr = this.seatArray.slice()
+				for (let num in seat) {
+					let status = 2 //-1为非座位，0为未购座位，1为已选座位(绿色),2为已购座位(红色)
+					if (seat[num].Status === 0) {
+						status = 0
+					} else if (seat[num].Status === -1) {
+						status = -1
+					}
+					arr[parseInt(seat[num].YCoord) - this.minRow][parseInt(seat[num].XCoord) - this.minCol] = {
+						type: status,
+						SeatCode: seat[num].SeatCode,
+						RowNum: seat[num].RowNum,
+						ColumnNum: seat[num].ColumnNum
+					}
+				}
+				this.seatArray = arr.slice()
+				console.log("===this.seatArray==slice",this.seatArray);
+				let mArr = []
+				for (let i in arr) {
+					let m = ''
+					for (let n of arr[i]) {
+						if (n.SeatCode) {
+							m = n.RowNum
+						}
+					}
+					if (m) {
+						mArr.push(m)
+					} else {
+						mArr.push('')
+					}
+				}
+				this.mArr = mArr
+			},
+			//放大缩小事件
+			onScale: function(e) {
+				this.showTis = false
+				// this.moveX=-e.detail.x
+				let w = this.boxWidth * 0.5
+				let s = 1 - e.detail.scale
+				this.moveX = w * s
+				this.scale = e.detail.scale
+				if (s > 0 || s === 0) {
+					this.showTis = true
+				}
+			},
+			//移动事件
+			onMove: function(e) {
+				this.showTis = false
+				this.moveX = e.detail.x
+			},
+			//重置座位
+			resetSeat: function() {
+				this.SelectNum = 0
+				this.optArr = []
+				//将所有已选座位的值变为0
+				let oldArray = this.seatArray.slice();
+				for (let i = 0; i < this.seatRow; i++) {
+					for (let j = 0; j < this.seatCol; j++) {
+						if (oldArray[i][j].type === 1) {
+							oldArray[i][j].type = 0
+						}
+					}
+				}
+				this.seatArray = oldArray;
+			},
+			//选定且购买座位
+			buySeat: function() {
+				console.log("===SelectNum",this.SelectNum);
+				if (this.SelectNum === 0) {
+					return
+				}
+				let oldArray = [];
+				for (let i = 0; i < this.seatRow; i++) {
+					for (let j = 0; j < this.seatCol; j++) {
+						if (this.seatArray[i][j].type === 1) {
+							oldArray.push(this.seatArray[i][j].SeatCode)
+						}
+					}
+				}
+				
+				console.log("===oldArray",oldArray);
+				// uni.navigateTo({
+				// 	url:'/subPages/pages/movies/moviesOrder'
+				// })
+			},
+			//处理座位选择逻辑
+			handleChooseSeat: function(row, col) {
+				
+				
+				let seatValue = this.seatArray[row][col].type;
+				let newArray = this.seatArray;
+				//如果是已购座位，直接返回
+				if (seatValue === 2 || seatValue === -1) return
+				//如果是已选座位点击后变未选
+				if (seatValue === 1) {
+					if(col % 2 ==0){ //偶数
+						newArray[row][col].type = 0
+						newArray[row][col-1].type = 0
+					}else {
+						newArray[row][col].type = 0
+						newArray[row][col+1].type = 0
+					}
+					this.SelectNum--
+					this.getOptArr(newArray[row][col], 0)
+				} else if (seatValue === 0) {
+					console.log("===SelectNum",this.SelectNum);
+					if(this.SelectNum==4){
+						uni.showToast({
+							title:'每次最多只能选择4个座位',
+							icon:'none'
+						})
+						return
+					}
+					
+					if(col % 2 ==0){ //偶数
+						newArray[row][col].type = 1
+						newArray[row][col-1].type = 1
+					}else {
+						newArray[row][col].type = 1
+						newArray[row][col+1].type = 1
+					}
+					this.SelectNum++
+					this.getOptArr(newArray[row][col], 1)
+					
+					
+				}
+				//必须整体更新二维数组，Vue无法检测到数组某一项更新,必须slice复制一个数组才行
+				this.seatArray = newArray.slice();
+			
+			},
+			//处理已选座位数组
+			getOptArr: function(item, type) {
+				let optArr = this.optArr
+				if (type === 1) {
+					optArr.push(item)
+					console.log("===optArr",optArr);
+				} else if (type === 0) {
+					let arr = []
+					optArr.forEach(v => {
+						if (v.SeatCode !== item.SeatCode) {
+							arr.push(v)
+						}
+					})
+					optArr = arr
+				}
+				this.optArr = optArr.slice()
+			},
+			//推荐选座,参数是推荐座位数目，
+			smartChoose: function(num) {
+				console.log('num===', num)
+				// 先重置
+				this.resetSeat()
+				//找到影院座位水平垂直中间位置的后一排
+				let rowStart = parseInt((this.seatRow - 1) / 2, 10) + 1;
+				//先从中间排往后排搜索
+				let backResult = this.searchSeatByDirection(rowStart, this.seatRow - 1, num);
+				if (backResult.length > 0) {
+					this.chooseSeat(backResult);
+					this.SelectNum += num
+					return
+				}
+				//再从中间排往前排搜索
+				let forwardResult = this.searchSeatByDirection(rowStart - 1, 0, num);
+				if (forwardResult.length > 0) {
+					this.chooseSeat(forwardResult);
+					this.SelectNum += num
+					return
+				}
+				//提示用户无合法位置可选
+				alert('无合法位置可选!')
+			
+			},
+			
+			//搜索函数,参数:fromRow起始行，toRow终止行,num推荐座位数
+			searchSeatByDirection: function(fromRow, toRow, num) {
+				/*
+				 * 推荐座位规则
+				 * (1)初始状态从座位行数的一半处的后一排的中间开始向左右分别搜索，取离中间最近的，如果满足条件，
+				 *    记录下该结果离座位中轴线的距离，后排搜索完成后取距离最小的那个结果座位最终结果，优先向后排进行搜索，
+				 *    后排都没有才往前排搜，前排逻辑同上
+				 *
+				 * (2)只考虑并排且连续的座位，不能不在一排或者一排中间有分隔
+				 *
+				 * */
+
+				/*
+				 * 保存当前方向搜索结果的数组,元素是对象,result是结果数组，offset代表与中轴线的偏移距离
+				 * {
+				 *   result:Array([x,y])
+				 *   offset:Number
+				 * }
+				 *
+				 */
+				let currentDirectionSearchResult = [];
+
+				let largeRow = fromRow > toRow ? fromRow : toRow,
+					smallRow = fromRow > toRow ? toRow : fromRow;
+
+				for (let i = smallRow; i <= largeRow; i++) {
+					//每一排的搜索,找出该排里中轴线最近的一组座位
+					let tempRowResult = [],
+						minDistanceToMidLine = Infinity;
+					for (let j = 0; j <= this.seatCol - num; j++) {
+						//如果有合法位置
+						if (this.checkRowSeatContinusAndEmpty(i, j, j + num - 1)) {
+							//计算该组位置距离中轴线的距离:该组位置的中间位置到中轴线的距离
+							let resultMidPos = parseInt((j + num / 2), 10);
+							let distance = Math.abs(parseInt(this.seatCol / 2) - resultMidPos);
+							//如果距离较短则更新
+							if (distance < minDistanceToMidLine) {
+								minDistanceToMidLine = distance;
+								//该行的最终结果
+								tempRowResult = this.generateRowResult(i, j, j + num - 1)
+							}
+						}
+					}
+					//保存该行的最终结果
+					currentDirectionSearchResult.push({
+						result: tempRowResult,
+						offset: minDistanceToMidLine
+					})
+				}
+
+				//处理后排的搜索结果:找到距离中轴线最短的一个
+				//注意这里的逻辑需要区分前后排，对于后排是从前往后，前排则是从后往前找
+				let isBackDir = fromRow < toRow;
+				let finalReuslt = [],
+					minDistanceToMid = Infinity;
+				if (isBackDir) {
+					//后排情况,从前往后
+					currentDirectionSearchResult.forEach((item) => {
+						if (item.offset < minDistanceToMid) {
+							finalReuslt = item.result;
+							minDistanceToMid = item.offset;
+						}
+					});
+				} else {
+					//前排情况，从后往前找
+					currentDirectionSearchResult.reverse().forEach((item) => {
+						if (item.offset < minDistanceToMid) {
+							finalReuslt = item.result;
+							minDistanceToMid = item.offset;
+						}
+					})
+				}
+
+				//直接返回结果
+				return finalReuslt
+			},
+
+			/*辅助函数，判断每一行座位从i列到j列是否全部空余且连续
+			 *
+			 */
+			checkRowSeatContinusAndEmpty: function(rowNum, startPos, endPos) {
+				let isValid = true;
+				for (let i = startPos; i <= endPos; i++) {
+					if (this.seatArray[rowNum][i].type !== 0) {
+						isValid = false;
+						break;
+					}
+				}
+				return isValid
+			},
+			//辅助函数：返回每一行的某个合理位置的座位数组
+			generateRowResult: function(row, startPos, endPos) {
+				let result = [];
+				for (let i = startPos; i <= endPos; i++) {
+					result.push([row, i])
+				}
+				return result
+			},
+			//辅助函数:智能推荐的选座操作
+			chooseSeat: function(result) {
+				let opt = this.optArr
+				let oldArray = this.seatArray.slice();
+				for (let i = 0; i < result.length; i++) {
+					//选定座位
+					oldArray[result[i][0]][result[i][1]].type = 1
+					this.optArr.push(oldArray[result[i][0]][result[i][1]])
+				}
+				this.seatArray = oldArray;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.p-all-10{
+		padding: 10rpx;
+	}
+	.ml-10 {
+		margin-left: 10rpx;
+	}
+
+	.m-0-10 {
+		margin: 0 10rpx;
+	}
+
+	.bg-unbtn {
+		background-color: #f9abb3;
+	}
+
+	.bg-red-1 {
+		background-color: #F45664;
+	}
+
+	.br-10 {
+		border-radius: 10rpx;
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.mb-20 {
+		margin-bottom: 20rpx;
+	}
+
+	.p-all-32 {
+		padding: 32rpx;
+	}
+
+	.fd-cr {
+		flex-direction: column-reverse;
+		/* 主轴方向从下到上,默认从左到右 */
+	}
+
+	.bottom-bar {
+		bottom: var(--window-bottom);
+	}
+
+	.color-fff {
+		color: #fff
+	}
+
+	.br-15 {
+		border-radius: 15rpx;
+	}
+
+	.over-h {
+		overflow: hidden;
+	}
+
+	.dp-ib {
+		display: inline-block;
+	}
+
+	.mt-20 {
+		margin-top: 20rpx;
+	}
+
+	.pa-v-2 {
+		/* 定位垂直对齐 */
+		left: 50%;
+		transform: translateX(-50%)
+	}
+
+	.b-d-1 {
+		border: 1px dashed #e5e5e5;
+	}
+
+	.w-100 {
+		width: 100%;
+	}
+
+	.h-100 {
+		height: 100%;
+	}
+
+	.bg-f1 {
+		background-color: #f1f1f1;
+	}
+
+	.h-100vh {
+		height: 100vh;
+	}
+
+	.pt-f {
+		position: fixed;
+	}
+
+	.left-0 {
+		left: 0;
+	}
+
+	.p-0-32 {
+		padding: 0 32rpx;
+	}
+
+	.pt-20 {
+		padding-top: 20rpx;
+	}
+
+	.bg-white {
+		background-color: #fff;
+	}
+
+	.z1000 {
+		z-index: 1000;
+	}
+
+	.fz-34 {
+		font-size: 34rpx;
+	}
+
+	.fw-b {
+		font-weight: bold;
+	}
+
+	.mt-10 {
+		margin-top: 10rpx;
+	}
+
+	.fz-28 {
+		font-size: 28rpx;
+	}
+
+	.color-666 {
+		color: #666666
+	}
+
+	.dp-f {
+		display: flex;
+	}
+
+	.jc-c {
+		justify-content: center;
+	}
+
+	.ai-c {
+		align-items: center;
+	}
+
+	.fz-22 {
+		font-size: 22rpx;
+	}
+
+	.color-333 {
+		color: #333333
+	}
+
+	.m-0-a {
+		margin: 0 auto;
+	}
+
+	.mt-48 {
+		margin-top: 48rpx;
+	}
+
+	.fz-20 {
+		font-size: 20rpx;
+	}
+
+	.color-999 {
+		color: #999999
+	}
+
+	.b-1 {
+		border: 1px solid #CCCCCC;
+	}
+
+	.br-5 {
+		border-radius: 5rpx;
+	}
+
+	.Stage {
+		background-color: #dddddd;
+		width: 380rpx;
+		height: 34rpx;
+		transform: perspective(34rpx) rotateX(-10deg);
+		margin: 0 auto;
+	}
+
+	.bg-line {
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.sel-seat {
+		background: url('/static/selected.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+	
+	.unsel-seat {
+		background: url('/static/unselected.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+	
+	.bought-seat {
+		background: url('/static/bought.png') center center no-repeat;
+		background-size: 100% 100%;
+	}
+</style>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 选择座位
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/movies/cityList.vue

@@ -0,0 +1,209 @@
+<template>
+	<view class="city-container">
+
+		<scroll-view class="scroll-content" scroll-y="true" :scroll-into-view='currentTagId'
+			scroll-with-animation="true">
+			<view class="scroll-item">
+				<input placeholder="输入城市名称查询" class="input-sty" type="text" :value="searchKey" @input="searchChange" />
+				<view v-if="!isSearch" class="list-content" v-for="(item,index) in cityName" :key="'city-item-'+index">
+					<view class="list-tag" :id="index">{{index}}</view>
+					<view @click="onCityClick(childItem)" class="list-city-content" v-for="(childItem,childIndex) in item"
+						:key="'child-city-item-'+childIndex">
+						<view class="list-city">{{childItem.city_name}}</view>
+						<view class="city-line" v-if="childIndex != item.length -1"></view>
+					</view>
+				</view>
+               <view v-if="isSearch" class="list-content" v-for="(item,index) in searchList" :key="'city-item-'+index">
+					<view class="list-city-content" @click="onCityClick(item)">
+						<view class="list-city">{{item.city_name}}</view>
+						<view class="city-line" v-if="index != searchList.length -1"></view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<view class="tag-list" v-if="!isSearch">
+			<view @click.stop="onTagClick(item)" :key="'tag-item-'+index" class="tag-name"
+				v-for="(item,index) in initialList">{{item}}</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+	import {
+		getLongitudeAndLatitude,
+	} from "~/apis/common";
+	import {
+		apiGetCityList,
+	} from '~/apis/movies'
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY,
+		USER_CHOOSE_CITY_CODE
+	} from '~/constants/index'
+
+
+	const searchKey = ref('')
+	const cityName = ref('')
+	const initialList = ref([])
+	const currentTagId = ref('A')
+	const isSearch = ref(false)
+	const searchList = ref([])
+
+	onLoad(() => {
+		getCityList()
+	})
+
+	function searchChange(e) {
+		searchKey.value = e.detail.value
+		if (searchKey.value) {
+			isSearch.value = true
+			for(let item in cityName.value){
+				if (cityName.value.hasOwnProperty(item)) {
+				        let value = cityName.value[item];
+						for (var i = 0; i < value.length; i++) {
+							let _info = value[i]
+							if(_info.city_name.includes(searchKey.value)){
+								searchList.value.push(_info)
+							}
+						}
+						
+				    }
+			}
+			
+		} else {
+			isSearch.value = false
+			searchList.value=[]
+		}
+	}
+
+	function onTagClick(item) {
+		currentTagId.value = item
+	}
+	
+	async  function onCityClick (item) {
+		//uni.showLoading({title:''})
+		 uni.setStorageSync(USER_CHOOSE_CITY,item.city_name)
+		uni.setStorageSync(USER_CHOOSE_CITY_CODE,item.city_sign)
+	  	await getLongitudeAndLatitude(item.city_name)
+		//uni.hideLoading()
+		uni.$emit('cityInfo',item)
+		uni.navigateBack()
+	}
+
+	function getCityList() {
+		uni.showLoading()
+		apiGetCityList().then(res => {
+			cityName.value = res.city_name
+			initialList.value = res.initial
+			uni.hideLoading()
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.city-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+
+		.tag-list {
+			position: fixed;
+			right: 0;
+			margin-top: 130rpx;
+
+
+			.tag-name {
+				width: 60rpx;
+				color: #538aff;
+				padding-top: 10rpx;
+				padding-bottom: 10rpx;
+				font-size: 24rpx;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+
+		.scroll-content {
+			display: flex;
+			flex-direction: column;
+			height: 100VH;
+			width: 100%;
+
+			.scroll-item {
+				display: flex;
+				flex-direction: column;
+				height: 2000rpx;
+				width: 100%;
+			}
+
+			.input-sty {
+				height: 80rpx;
+				min-height: 80rpx;
+				margin: 20rpx;
+				padding-left: 20rpx;
+				padding-right: 20rpx;
+				font-size: 28rpx;
+				color: #333;
+				box-sizing: border-box;
+				border-radius: 10rpx;
+				border: 1rpx solid #538aff;
+			}
+
+			.list-content {
+				display: flex;
+				flex-direction: column;
+
+				.list-tag {
+					font-size: 26rpx;
+					color: #999;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					margin-bottom: 20rpx;
+				}
+
+
+				.list-city-content {
+					display: flex;
+					flex-direction: column;
+					width: 100%;
+				}
+
+				.list-city {
+					width: 100%;
+					background-color: #fff;
+					height: 98rpx;
+					padding-left: 20rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					color: #333;
+					font-size: 28rpx;
+				}
+
+				.city-line {
+					width: 100%;
+					height: 1rpx;
+					background-color: #ebebeb;
+				}
+			}
+		}
+
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 选择城市
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/movies/moviesIndex.vue

@@ -0,0 +1,680 @@
+<template>
+	<view class="movies-container">
+
+		<view class="top-content">
+			<view class="head-content">
+				<view class="city-content" @click="onChooseCityClick">
+					<text class="city-name">{{currentCity}}</text>
+					<image class="down-arrow" src="/static/icon/downArrow.png" mode="widthFix"></image>
+				</view>
+				<view class="search-content">
+					<image class="search-icon" src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
+						mode="widthFix"></image>
+					<input class="input-ty" type="text" :value="searchKey" :placeholder="currentIndex==1?'搜索影院':'搜索电影'"
+						@input="oninputChange" />
+				</view>
+			</view>
+
+			<view class="fuc-content">
+				<view class="fuc-item" @click="onOrderListClick(1)">
+					<image class="fuc-icon" src="/static/icon/movies1.png" mode="widthFix"></image>
+					<text class="fuc-title">取票码</text>
+				</view>
+				<view class="fuc-item" @click="onOrderListClick(0)">
+					<image class="fuc-icon" src="/static/icon/movies2.png" mode="widthFix"></image>
+					<text class="fuc-title">订单</text>
+				</view>
+				<view class="fuc-item" @click="onCustomerClick">
+					<image class="fuc-icon" src="/static/icon/movies3.png" mode="widthFix"></image>
+					<text class="fuc-title">客服</text>
+				</view>
+			</view>
+
+			<view class="tab-content">
+				<view class="tab-item" @click="onTabClick(0)">
+					<text :class="currentIndex==0?'tab-title':'tab-default-title'">正在热映</text>
+					<view :class="currentIndex==0?'tab-line':'tab-default-line'"></view>
+				</view>
+				<view class="tab-item" @click="onTabClick(1)">
+					<text :class="currentIndex==1?'tab-title':'tab-default-title'">附件影院</text>
+					<view :class="currentIndex==1?'tab-line':'tab-default-line'"></view>
+				</view>
+				<view class="tab-item" @click="onTabClick(2)">
+					<text :class="currentIndex==2?'tab-title':'tab-default-title'">即将上映</text>
+					<view :class="currentIndex==2?'tab-line':'tab-default-line'"></view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="currentIndex!=1">
+			<view class="list-item" v-for="(item,index) in moviesList" :key="'movies-item-'+index" @click="onItemClick(item)">
+				<image class="item-img" :src="item.cover_img" mode="aspectFill"></image>
+				<view class="info-item">
+					<view class="title-content">
+						<text class="item-title">{{item.film_name}}</text>
+						<view class="item-tag-content-x" v-if="item.version">
+							<text class="item-tag-0">{{item.version.split(' ')[0]}}</text>
+							<text  v-if="item.version.split(' ').length==2" class="item-tag-1">{{item.version.split(' ')[1]}}</text>
+						</view>
+					</view>
+					<view class="title-content">
+						<text class="item-des">评分：</text>
+						<text class="item-red-des">{{item.grade}}</text>
+					</view>
+					<view class="title-content">
+						<text class="item-des">导演：{{item.director_name}}</text>
+					</view>
+					<view class="title-content">
+						<text class="item-des">主演：</text>
+						<text :class="currentIndex==0 ?'item-people':'item-people-x'">{{item.actors_name}}</text>
+					</view>
+					<view class="title-content">
+						<text class="item-date">{{item.publish_date}}</text>
+						<text class="item-des">上映</text>
+					</view>
+				</view>
+				<view v-if="currentIndex==0" class="right-btn">特惠购票</view>
+			</view>
+		</view>
+
+		<view v-else>
+			<view class="list-item" v-for="(item,index) in cinemaList" :key="'movies-item-'+index" @click="onItemClick(item)">
+				<view class="info-item">
+					<view class="title-content">
+						<text class="item-title-x">{{item.cinema_name}}</text>
+						<view class="price-child-content" v-if="item.price">
+							<text class="item-price">￥{{item.price}}</text>
+							<text class="item-price-unit">起</text>
+						</view>
+
+					</view>
+					<view class="title-content">
+						<text class="item-people-s">{{item.address}}</text>
+						<text class="item-jl">{{item.distance}}km</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		
+		 <CXBEmpty  v-if="(currentIndex!=1 && moviesList.length==0) "></CXBEmpty>
+          <CXBEmpty  v-if="(currentIndex==1 && cinemaList.length==0) "></CXBEmpty>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		getLocalX,
+		getRegeoX
+	} from "~/apis/common";
+	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY,
+		USER_CHOOSE_CITY_CODE
+	} from '~/constants/index'
+
+	import {
+		apiGetMovieList,
+		apiGetCinemaList,
+		apiGetCityList
+	} from '~/apis/movies'
+	
+	
+	
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
+	const searchKey = ref('')
+	const currentIndex = ref(0)
+	const moviesList = ref([])
+	const cinemaList = ref([])
+	const currentCity =ref('定位中...')
+	
+	const state = reactive({
+		page: 1,
+		limit: 10,
+		keyword: '',
+		count: 1,
+		cityCode:''
+	})
+
+	onLoad( (option) => {
+	let phone = uni.getStorageSync('USER_INFO_PHONE')
+		let city=  uni.getStorageSync(USER_CHOOSE_CITY)
+	    let cityCode = 	uni.setStorageSync(USER_CHOOSE_CITY_CODE )
+		if(city && cityCode){
+			currentCity.value =city
+			state.cityCode = cityCode
+			getList()
+		}else {
+			getLocalX((res)=>{
+				if(res){
+					getRegeoX((res)=>{
+						currentCity.value =res
+						getCityList()
+					})
+				}
+			})
+		}
+		
+		uni.$on('cityInfo',(res)=>{
+			currentCity.value =res.city_name
+			state.cityCode =res.city_code
+			if(currentIndex.value ==1){
+				getCinemaList()
+			}
+		})
+		
+	})
+	
+	function getCityList() {
+		uni.showLoading({title:'加载中...',mask:true})
+		apiGetCityList().then(res => {
+		for (var key in res.city_name) {
+			if (res.city_name.hasOwnProperty(key)) {
+				var element = res.city_name[key];
+				for (let s of element) {
+					if(s.city_name ==currentCity.value){
+						state.cityCode = s.city_sign
+						uni.setStorageSync(USER_CHOOSE_CITY_CODE,state.cityCode )
+						break
+					}
+				}
+			}
+		}
+		console.log("===state.cityCode",state.cityCode);
+		getList()
+		}).finally(()=>{uni.hideLoading()})
+	}
+	
+	function onCustomerClick(){
+		uni.openCustomerServiceChat({
+			extInfo: {
+				url: 'https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db',
+			},
+			corpId: 'wwaeb55681929a37ae',
+			success: (res) => {
+				console.log(res)
+			},
+			fail: (res) => {
+				console.log(res)
+			},
+		})
+		
+		
+	}
+	
+	function onOrderListClick(position){
+		uni.navigateTo({
+			url:`/subPages/pages/movies/orderList?type=${position}`
+		})
+	}
+	
+	function onItemClick (item){
+		if(currentIndex.value!=1){
+			uni.navigateTo({
+				url:`/subPages/pages/movies/nearbyCinemas?info=${encodeURIComponent(JSON.stringify(item))}&type=${currentIndex.value}`
+			})
+		}else {
+			uni.navigateTo({
+				url:`/subPages/pages/movies/moviesTicketList?info=${encodeURIComponent(JSON.stringify(item))}`
+			})
+		}
+		
+	}
+
+	
+	function onChooseCityClick(){
+		uni.navigateTo({
+			url:'/subPages/pages/movies/cityList'
+		})
+	}
+
+	function getCinemaList() {
+		let latitude = uni.getStorageSync(USER_LATITUDE)
+		let longitude = uni.getStorageSync(USER_LONGITUDE)
+		uni.showLoading()
+		let params =
+			`page=${state.page}&limit=${state.limit}&longitude=${longitude}&latitude=${latitude}&cinema_name=${searchKey.value}`
+		apiGetCinemaList(params).then(res => {
+			state.count = res.count
+			if (state.page === 1) {
+				cinemaList.value = res.cinema_list
+			} else {
+				cinemaList.value.push(...res.cinema_list)
+			}
+			uni.hideLoading()
+		})
+	}
+
+	function getList() {
+		if (currentIndex.value == 1) {
+			getCinemaList()
+		} else {
+			getmoviesList()
+		}
+	}
+
+	function getmoviesList() {
+		uni.showLoading()
+		let params = `page=${state.page}&limit=${state.limit}&type=${currentIndex.value==2?1:0}&film_name=${searchKey.value}`
+		apiGetMovieList(params).then(res => {
+			state.count = res.count
+			console.log("===state.cityCode11");
+			if (state.page === 1) {
+				moviesList.value = res.film_list
+			} else {
+				moviesList.value.push(...res.film_list)
+			}
+			uni.hideLoading()
+		})
+	}
+
+	function oninputChange(e) {
+		searchKey.value = e.detail.value
+		getList()
+	}
+
+	function onTabClick(position) {
+		currentIndex.value = position
+		state.page = 1
+		state.count = 1
+		searchKey.value = ''
+		if (position == 1) {
+			getCinemaList()
+		} else {
+			getmoviesList()
+		}
+	}
+
+	onPullDownRefresh(() => {
+		state.page = 1
+		getList()
+		uni.stopPullDownRefresh()
+	})
+
+	onReachBottom(() => {
+		if (moviesList.value.length < state.count) {
+			state.page += 1
+			getList()
+		}
+	})
+</script>
+
+<style lang="scss" scoped>
+	.movies-container {
+		display: flex;
+		padding-bottom: 60rpx;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+		padding-top: 350rpx;
+		
+		.empty-content{
+			margin-top: 500rpx;
+		}
+
+		.top-content {
+			display: flex;
+			flex-direction: column;
+			position: fixed;
+			top: 0;
+			width: 100%;
+			z-index: 66;
+			left: 0;
+		}
+
+		.list-item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding: 24rpx 18rpx;
+			background-color: #fff;
+			margin-top: 24rpx;
+			border-radius: 10rpx;
+			position: relative;
+			margin-left: 22rpx;
+			margin-right: 22rpx;
+
+			.item-img {
+				width: 174rpx;
+				min-width: 174rpx;
+				height: 234rpx;
+				background-color: #f5f5f5;
+				border-radius: 20rpx;
+				margin-right: 22rpx;
+			}
+
+			.right-btn {
+				width: 148rpx;
+				height: 64rpx;
+				margin-top: 40rpx;
+				line-height: 64rpx;
+				text-align: center;
+				background-color: #eb4340;
+				color: #fff;
+				font-size: 28rpx;
+				border-radius: 64rpx;
+				position: absolute;
+				right: 0;
+				font-weight: bolder;
+				margin-right: 26rpx;
+			}
+
+			.right-black-btn {
+				width: 148rpx;
+				margin-top: 40rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				border-radius: 64rpx;
+				background-color: #000;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bolder;
+				position: absolute;
+				margin-right: 26rpx;
+				right: 0;
+			}
+
+			.info-item {
+				display: flex;
+				flex-direction: column;
+				width: 100%;
+
+				.title-content {
+					display: flex;
+					flex-direction: row;
+					margin-bottom: 12rpx;
+					align-items: center;
+					width: 100%;
+
+					.item-title {
+						font-size: 32rpx;
+						font-weight: bolder;
+						color: #333;
+						margin-right: 10rpx;
+						max-width: 370rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.price-child-content {
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						flex: 1;
+						justify-content: flex-end;
+					}
+
+					.item-title-x {
+						font-size: 32rpx;
+						font-weight: bolder;
+						color: #333;
+						flex: 1;
+						margin-right: 10rpx;
+						max-width: 550rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-people-s {
+						font-size: 22rpx;
+						color: #666;
+						max-width: 550rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-jl {
+						font-size: 22rpx;
+						color: #999;
+						flex: 1;
+						text-align: right;
+						line-height: 22rpx;
+						height: 22rpx;
+					}
+
+					.item-price {
+						font-size: 26rpx;
+						color: #df4743;
+						font-weight: bolder;
+					}
+
+					.item-price-unit {
+						font-size: 26rpx;
+						color: #999;
+						font-weight: bolder;
+					}
+
+					.item-red-des {
+						font-size: 28rpx;
+						color: #df4743;
+						font-weight: bolder;
+					}
+
+					.item-des {
+						font-size: 22rpx;
+						color: #999;
+					}
+
+					.item-date {
+						font-size: 22rpx;
+						color: #666;
+					}
+
+					.item-people {
+						font-size: 22rpx;
+						color: #999;
+						max-width: 240rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-people-x {
+						font-size: 22rpx;
+						color: #999;
+						max-width: 370rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-tag-content-x {
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						height: 32rpx;
+						border: 1rpx solid #999999;
+						border-radius: 6rpx;
+
+						.item-tag-0 {
+							font-size: 16rpx;
+							color: #fff;
+							height: 32rpx;
+							background-color: #999;
+							padding-right: 6rpx;
+							padding-left: 6rpx;
+							line-height: 32rpx;
+							text-align: center;
+						}
+
+						.item-tag-1 {
+							font-size: 16rpx;
+							color: #999;
+							height: 32rpx;
+							padding-left: 6rpx;
+							padding-right: 6rpx;
+							line-height: 32rpx;
+							text-align: center;
+						}
+					}
+				}
+			}
+		}
+
+		.tab-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			background-color: #fff;
+
+			.tab-item {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				align-items: center;
+				position: relative;
+				padding-top: 20rpx;
+
+				.tab-title {
+					font-size: 36rpx;
+					color: #333;
+					font-weight: bolder;
+					margin-bottom: 30rpx;
+				}
+
+				.tab-default-title {
+					font-size: 32rpx;
+					color: #666;
+					font-weight: bolder;
+					margin-bottom: 30rpx;
+				}
+
+				.tab-default-line {
+					width: 40rpx;
+					height: 10rpx;
+					background-color: #fff;
+					position: absolute;
+					bottom: 0;
+					border-radius: 10rpx;
+					margin-bottom: 10rpx;
+				}
+
+				.tab-line {
+					width: 40rpx;
+					height: 10rpx;
+					background-color: #ff0000;
+					position: absolute;
+					bottom: 0;
+					margin-bottom: 10rpx;
+					border-radius: 10rpx;
+				}
+			}
+		}
+
+		.fuc-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			padding-top: 20rpx;
+			padding-bottom: 30rpx;
+			justify-content: space-around;
+
+			.fuc-item {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				align-items: center;
+				justify-content: center;
+
+				.fuc-icon {
+					width: 50rpx;
+					height: 54rpx;
+				}
+
+				.fuc-title {
+					color: #333;
+					font-size: 24rpx;
+					margin-top: 24rpx;
+				}
+			}
+		}
+
+		.head-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			padding-top: 20rpx;
+			padding-bottom: 20rpx;
+
+			.city-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+
+				.city-name {
+					font-size: 32rpx;
+					color: #333;
+					padding-left: 30rpx;
+					font-weight: bolder;
+					margin-right: 12rpx;
+				}
+
+				.down-arrow {
+					width: 24rpx;
+					height: 18rpx;
+				}
+			}
+
+			.search-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				background-color: #f5f5f5;
+				height: 60rpx;
+				flex: 1;
+				border-radius: 60rpx;
+				padding-left: 20rpx;
+				margin-left: 24rpx;
+				padding-right: 20rpx;
+				box-sizing: border-box;
+				margin-right: 30rpx;
+
+				.search-icon {
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.input-ty {
+					font-size: 26rpx;
+					color: #333;
+					padding-left: 20rpx;
+				}
+			}
+		}
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 电影专区
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/movies/moviesOrder.vue

@@ -0,0 +1,523 @@
+<template>
+	<view class="movies-oder-container" v-if="orderDetail">
+		<view class="card-content">
+			<view class="list-item">
+				<image class="item-img" :src="orderDetail.film.cover_img" mode="aspectFill"></image>
+				<view class="info-item">
+					<text class="item-title">{{orderDetail.film_name}}</text>
+					<text class="file-des mb-24-x">{{orderDetail.sched_time}} </text>
+					<text class="file-des mb-24-x">{{orderDetail.cinema_name}}</text>
+					<view class="title-content ">
+						<text class="file-des">{{orderDetail.hall_name}}</text>
+						<text class="file-des-x" :key="'seat-item-'+index"
+							v-for="(item,index) in orderDetail.sched_seat">{{item.seat_no}}</text>
+					</view>
+				</view>
+				<view class="timer-content">
+					<image class="timer-icon" src="/static/icon/timer_icon.png" mode="widthFix"></image>
+					<text class="timer-tx"> {{ formatTime(minutes) }}:{{ formatTime(seconds) }}</text>
+				</view>
+			</view>
+
+			<view class="hint-info">
+				<image class="close-icon" src="/static/icon/red_close.png" mode="widthFix"></image>
+				<text class="hint-tx">不支持退票</text>
+				<image class="close-icon" src="/static/icon/red_close.png" mode="widthFix"></image>
+				<text class="hint-tx-1">不支持改签</text>
+				<text class="hint-tx">共{{orderDetail.sched_seat.length}}张</text>
+				<!-- <text class="hint-tx">原价￥60</text> -->
+			</view>
+
+			<!-- <view class="discount-info">
+				<text class="discount-tx">本单已优惠</text>
+				<text class="discount-price">-3.6</text>
+			</view> -->
+			<view class="card-line"></view>
+
+
+			<view class="discount-info">
+				<text class="fare-tx">票价合计</text>
+				<text class="fare-price-unit">￥</text>
+				<text class="fare-price">{{orderDetail.order_price}}</text>
+			</view>
+		</view>
+
+		<view class="card-content">
+			<view class="discount-info">
+				<text class="discount-tx">手机号码</text>
+				<input class="phone-value" type="text" v-model="userPhone" placeholder="请先填写手机号码" />
+			</view>
+			<view class="card-line"></view>
+			<text class="discount-tx-hine">仅用于出票异常时联系,取票码不会通过短信发送</text>
+		</view>
+
+
+		<!-- <view class="card-content">
+			<view class="discount-info">
+				<text class="discount-tx">无座位时,接受系统调座</text>
+				<switch checked="false" @change="onSwitchClick" />
+			</view>
+			<view class="card-line"></view>
+			<text class="discount-tx-hine mb-6-x">1.接受调座,当您选择的座位已售出时,系统自动为您选择最佳观影座位</text>
+			<view class="discount-info">
+				<text class="discount-tx-hine">2.</text>
+				<text class="discount-price">若不接受调座则出票率较低</text>
+				<text class="discount-tx-hine">,请谨慎选择。</text>
+			</view>
+		</view> -->
+
+		<view class="card-content">
+			<view class="discount-info">
+				<text class="discount-tx">购票须知</text>
+				<image @click="onCheckClick" class="radio-icon" :src="isCheck?checkRadioIconx:defautRadioIconx"
+					mode="widthFix"></image>
+				<text @click="onCheckClick" class="right-big-tx">{{isCheck?'已读':'未读'}}</text>
+			</view>
+
+			<view class="card-line"></view>
+			<view class="discount-info mb-6-x">
+				<text class="discount-tx-hine">1.请确认播放场次和时间、片名、人数、座位无误,已出票的订单<text
+						class="discount-price">不可改签、退票;</text></text>
+			</view>
+			<text class="discount-tx-hine mb-6-x">2.若设备故障、存在少量影院排片变化等不可抗因素,会进行退票退款;</text>
+			<text class="discount-tx-hine mb-6-x">3.若因系统繁忙的情况下,存在出票失败的情况下,会进行退款;</text>
+			<text class="discount-tx-hine mb-6-x">4.取票码可在“电影首页-取票码或订单”中查看;</text>
+			<text class="discount-tx-hine">5.如有疑问，请联系平台客服;</text>
+
+		</view>
+
+		<view class="bottom-btn-content">
+			<view class="left-content">
+				<view class="left-top-info">
+					<text class="pay-price-title">应付：</text>
+					<text class="pay-price">￥{{orderDetail.order_price}}</text>
+				</view>
+				<!-- <text class="price-hint">总计优惠：2.7元</text> -->
+			</view>
+			<view class="right-btn" @click="onPayClick">立即付款</view>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		getLocal,
+	} from "~/apis/common";
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY
+	} from '~/constants/index'
+	import {
+		IMG_CDN_NEW_URL
+	} from '~/config/app'
+	import {
+		apiGetOrderInfo,
+		apiConfirmOrder
+	} from '~/apis/movies'
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+
+	const totalTime = 600 // 5分钟=300秒
+	const count = ref(totalTime)
+	const minutes = ref(0)
+	const seconds = ref(0)
+	const defautRadioIconx = ref(IMG_CDN_NEW_URL + 'SingleChoice_nor.png')
+	const checkRadioIconx = ref(IMG_CDN_NEW_URL + 'SingleChoice_sel.png')
+	const isCheck = ref(false)
+	let timer = null
+	let order_sn = ''
+	let oid =''
+	let type =''
+	let code =''
+	const orderDetail = ref()
+	const userPhone = ref('')
+
+	// 格式化时间补零
+	const formatTime = (num) => num < 10 ? `0${num}` : num
+	onLoad((option) => {
+		console.log("===option.order_sn",option.oid);
+		if (option.order_sn) {
+			order_sn = option.order_sn
+			oid = option.oid
+			type = option.type
+			code = option.code
+			initTimer()
+			getDetailInfo()
+		}
+		userPhone.value = uni.getStorageSync('USER_INFO_PHONE')
+	})
+
+	function getDetailInfo() {
+		uni.showLoading({
+			title: '加载中...'
+		})
+		apiGetOrderInfo(order_sn).then(res => {
+			uni.hideLoading()
+			orderDetail.value = res
+		})
+	}
+
+
+	function initTimer() {
+		timer = setInterval(() => {
+			count.value--
+
+			updateCountdown()
+		}, 1000)
+	}
+
+	onUnmounted(() => {
+		clearInterval(timer)
+	})
+
+	// 更新倒计时
+	const updateCountdown = () => {
+		minutes.value = Math.floor(count.value / 60)
+		seconds.value = count.value % 60
+		if (count.value <= 0) {
+			clearInterval(timer)
+			uni.showModal({
+				title: '付款超时,请返回重新选择座位！',
+				showCancel: false,
+				complete: (res) => {
+					if (res.confirm) {
+						uni.navigateBack()
+					}
+				}
+			})
+		}
+	}
+
+	function onCheckClick() {
+		isCheck.value = !isCheck.value
+	}
+
+	function onSwitchClick(e) {
+
+	}
+
+
+
+	function onPayClick() {
+
+		if (!userPhone.value) {
+			uni.showToast({
+				title: '请先填写手机号码',
+				icon: 'none'
+			})
+			return
+		}
+		if (!isCheck.value) {
+			uni.showToast({
+				title: '请仔细阅读并勾选购票须知',
+				icon: 'none'
+			})
+			return
+		}
+
+		uni.showLoading({
+			title: '请求中...'
+		})
+
+
+
+		let params = {
+			phone: userPhone.value,
+			oid : oid,
+			type :type,
+			code :code,
+		}
+		apiConfirmOrder(params).then(res => {
+			uni.redirectTo({
+				url: `/pages/payment/index?pay_price=${orderDetail.value.order_price}&order_id=${oid}&initType=3&order_sn=${order_sn}&type=${res.pay_channel}`
+			})
+			uni.hideLoading()
+		}).catch((e) => {
+			uni.showToast({
+				title: e || '接口异常!',
+				icon: 'none'
+			})
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.movies-oder-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+		padding-bottom: 200rpx;
+
+		.bottom-btn-content {
+			display: flex;
+			flex-direction: row;
+			height: 180rpx;
+			align-items: center;
+			z-index: 22;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			box-sizing: border-box;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
+			background-color: #fff;
+
+			.right-btn {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+				font-size: 30rpx;
+				background-color: #fc425a;
+				border-radius: 80rpx;
+				height: 80rpx;
+				width: 200rpx;
+			}
+
+			.left-content {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+
+				.price-hint {
+					font-size: 24rpx;
+					margin-top: 10rpx;
+					color: #999;
+				}
+
+				.left-top-info {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+
+					.pay-price-title {
+						font-size: 30rpx;
+						color: #333;
+					}
+
+					.pay-price {
+						font-size: 30rpx;
+						color: #f44546;
+						font-weight: bolder;
+					}
+				}
+
+			}
+		}
+
+		.mb-6-x {
+			margin-bottom: 10rpx;
+		}
+
+		.radio-icon {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		.right-big-tx {
+			font-size: 30rpx;
+			color: #999;
+			margin-left: 10rpx;
+		}
+
+		.check-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+		}
+
+		.discount-info {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.fare-tx {
+				font-size: 30rpx;
+				color: #999;
+				flex: 1;
+			}
+
+			.fare-price {
+				font-size: 30rpx;
+				font-weight: bolder;
+				color: #f44546;
+			}
+
+			.fare-price-unit {
+				font-size: 26rpx;
+				color: #f44546;
+			}
+
+
+			.discount-tx {
+				font-size: 30rpx;
+				font-weight: bolder;
+				color: #333;
+				flex: 1;
+			}
+
+			.phone-value {
+				font-size: 30rpx;
+				color: #333;
+				text-align: right;
+			}
+
+			.discount-price {
+				font-size: 26rpx;
+				color: #f44546;
+			}
+		}
+
+		.discount-tx-hine {
+			font-size: 26rpx;
+			color: #666;
+		}
+
+		.rifht-big-tx {
+			font-size: 30rpx;
+			color: #999;
+		}
+
+		.card-line {
+			height: 1rpx;
+			width: 100%;
+			background-color: #eeeeee;
+			margin-top: 30rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.card-content {
+			display: flex;
+			flex-direction: column;
+			background-color: #fff;
+			padding: 24rpx 18rpx;
+			margin-top: 24rpx;
+			border-radius: 10rpx;
+			position: relative;
+			margin-left: 22rpx;
+			margin-right: 22rpx;
+		}
+
+		.hint-info {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-top: 50rpx;
+			margin-bottom: 60rpx;
+
+			.close-icon {
+				width: 26rpx;
+				height: 26rpx;
+				margin-right: 4rpx;
+			}
+
+			.hint-tx {
+				font-size: 26rpx;
+				color: #000;
+				margin-right: 10rpx;
+			}
+
+			.hint-tx-1 {
+				font-size: 26rpx;
+				color: #000;
+				margin-right: 10rpx;
+				flex: 1;
+			}
+		}
+
+		.list-item {
+			display: flex;
+			flex-direction: row;
+			position: relative;
+
+
+			.timer-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+
+				.timer-icon {
+					width: 50rpx;
+					margin-right: 4rpx;
+					height: 50rpx;
+				}
+
+				.timer-tx {
+					font-size: 28rpx;
+					color: #000;
+				}
+			}
+
+
+			.item-img {
+				width: 174rpx;
+				min-width: 174rpx;
+				height: 234rpx;
+				background-color: #000;
+				border-radius: 20rpx;
+				margin-right: 22rpx;
+			}
+
+			.mb-24-x {
+				margin-bottom: 20rpx;
+			}
+
+			.info-item {
+				display: flex;
+				flex-direction: column;
+				width: 100%;
+
+				.title-content {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					width: 100%;
+				}
+
+				.item-title {
+					font-size: 32rpx;
+					font-weight: bolder;
+					color: #333;
+					margin-right: 10rpx;
+					max-width: 350rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					margin-bottom: 32rpx;
+					/* 隐藏溢出的内容 */
+					text-overflow: ellipsis;
+					/* 显示省略号来代表被修剪的文本 */
+				}
+
+				.file-des {
+					font-size: 24rpx;
+					color: #999;
+				}
+
+				.file-des-x {
+					font-size: 26rpx;
+					margin-left: 10rpx;
+					color: #000;
+					font-weight: bolder;
+				}
+			}
+		}
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 确认订单
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/movies/moviesTicketList.vue

@@ -0,0 +1,603 @@
+<template>
+	<view class="movies-container">
+
+		<view class="top-f-content">
+			
+			<view class="top-content">
+				<image class="img-ty" :src="topBg" mode="aspectFill"></image>
+				<view class="top-title-content" :style="navBarHeight" v-if="moviesList&& moviesList.length!=0">
+					<image @click="onBackClick" class="left-arrow" src="/static/icon/leftArrow.png" mode="widthFix"></image>
+					<text class="title-name">{{moviesList[currentMoviesIndex].film_name}}</text>
+				</view>
+				
+				<view class="address-content" @click="onAddressClick">
+					<view class="address-info">
+						<text class="shop-name">{{initInfo.cinema_name}}</text>
+						<text class="shop-address">{{initInfo.address}}</text>
+					</view>
+					<image class="address-icon" src="/static/icon/map_address_icon.png" mode="widthFix"></image>
+				</view>
+			</view>
+			<view class="movies-lab-content">
+				<scroll-view scroll-x="true" class="lab-item">
+					<view class="lab-item-x" v-for="(item,index) in moviesList" :key="'lab-item-x-'+index">
+						<image @click="onMoviesClick(index)" :class="currentMoviesIndex==index?'movies-big-item':'movies-item'" :src="item.cover_img" mode="aspectFill"></image>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="grade-content" v-if="moviesList && moviesList.length !=0">
+				<text class="title">{{moviesList[currentMoviesIndex].film_name}}</text>
+				<text class="grade">{{moviesList[currentMoviesIndex].grade}}</text>
+			</view>
+			
+			<view class="des-content"  v-if="moviesList && moviesList.length !=0">
+				<text class="time-des">{{moviesList[currentMoviesIndex].duration}}分钟</text>
+				<view class="time-line"></view>
+				<text class="time-des">{{moviesList[currentMoviesIndex].type}}</text>
+				<view class="time-line"></view>
+				<text class="time-des-content">{{moviesList[currentMoviesIndex].actors_name}}</text>
+			</view>
+
+		<view class="lab-content">
+			<scroll-view scroll-x="true" class="lab-item">
+				<view class="lab-item-x" v-for="(item,index) in dateList" :key="'lab-item-x-'+index">
+					<view class="lab-item-small" @click="onTabClick(index)">
+						<text :class="currentIndex==index?'lab-title':'lab-default-title'">{{formatTimestamp(item.date_timestamp)}} {{item.date}}</text>
+						<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		</view>
+
+		<view  class="list-item" v-for="(item,index) in cinemaList" :key="'movies-item-'+index" @click="onChooseSeatClick(item)">
+			<view class="item-h">
+				<text class="item-time">{{item.show_time}}</text>
+				<text class="item-des">{{item.end_time}}散场</text>
+			</view>
+			<view class="item-h-1">
+				<text class="item-time">{{item.film.language=='汉语普通话'?'国语':item.film.language}} {{item.film.version}}</text>
+				<text class="item-des">{{item.hall_name}}</text>
+			</view>
+			<view class="item-h">
+				<text class="item-price">￥{{item.price}}</text>
+				<!-- <text class="item-price-unit">市场价￥46</text> -->
+			</view>
+			<view class="buy-btn">购票</view>
+		</view>
+		
+		 <CXBEmpty  v-if="cinemaList.length==0"></CXBEmpty>
+		
+	</view>
+</template>
+
+<script setup>
+	import {
+		getLocal,
+	} from "~/apis/common";
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY
+	} from '~/constants/index'
+    import {formatTimestamp} from "~/utils/util"
+	import {
+		apiGetFilmschedDate,
+		apiGetCinemafilmSchedList,
+		apiGetHomeMovieList
+	} from '~/apis/movies'
+	import {formatDate}from'~/utils/util'
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
+	const topBg =ref('https://api.hxxfb.com/share/xcx/jd_bg.png')
+	const searchKey = ref('')
+	const currentIndex = ref(0)
+	const cinemaList = ref([])
+	const currentCity = ref('请选择城市')
+	const title = ref('')
+	const initInfo = ref({})
+	const dateList = ref([])
+	const currentMoviesIndex =ref(0)
+	const moviesList =ref([])
+	const totalList=ref([])
+
+	const state = reactive({
+		page: 1,
+		limit: 10,
+		keyword: '',
+		count: 1,
+	})
+
+	const systemInfo = uni.getSystemInfoSync()
+	const statusBarHeight = systemInfo.statusBarHeight ?? 0
+	const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+    let filmSign =''
+	const navBarHeight = computed(() => {
+		return {
+			marginTop: `${menuButtonInfo.top}px`,
+			height: `${menuButtonInfo.bottom -menuButtonInfo.top}px`,
+		}
+	})
+
+	onLoad( (option) => {
+		let info = option.info
+		console.log("===option.info",option.info);
+		 filmSign =option.film_sign
+		if (info) {
+			initInfo.value = JSON.parse(decodeURIComponent(info))
+		     getmoviesList()
+		}
+	})
+	
+    function onTabClick(position){
+		currentIndex.value = position
+		cinemaList.value = totalList.value[dateList.value[currentIndex.value].date]
+	}
+	
+	function onMoviesClick(position){
+		currentMoviesIndex.value =position
+		getCinemafilmSchedList()
+	}
+	
+	function onChooseSeatClick(item){
+		let params ={
+			relation_id:item.relation_id,
+			sched_sign:item.sched_sign,
+			show_date:item.show_date,
+			show_time:item.show_time,
+			film_name:moviesList.value[currentMoviesIndex.value].film_name,
+			hall_name:item.hall_name,
+			hall_sign:item.hall_sign,
+			film_sign:moviesList.value[currentMoviesIndex.value].film_sign,
+			cinema_sign:initInfo.value.cinema_sign,
+			show_des:`${formatDate(item.show_date,7,'-')} ${item.show_time}-${item.end_time} (${item.film.language=='汉语普通话'?'国语':item.film.language} ${item.film.version})`
+		}
+		uni.navigateTo({
+			url:`/subPages/pages/movies/chooseSeat?info=${encodeURIComponent(JSON.stringify(params))}`
+		})
+	}
+	
+	function getmoviesList() {
+		uni.showLoading()
+		apiGetHomeMovieList().then(res => {
+			moviesList.value =res.film_list
+			for (var i = 0; i < res.film_list.length; i++) {
+				if(filmSign == res.film_list[i].film_sign){
+					currentMoviesIndex.value =i
+					break
+				}
+			}
+			getCinemafilmSchedList()
+		})
+	}
+	
+	function onAddressClick(){
+		let latitude = uni.getStorageSync(USER_LATITUDE)
+		let longitude = uni.getStorageSync(USER_LONGITUDE)
+		uni.showLoading({
+			title:'初始化...'
+		})
+		
+		uni.openLocation({
+		        latitude: parseFloat(latitude),
+		        longitude:parseFloat(longitude),
+		        name: initInfo.value.cinema_name,
+		        address:initInfo.value.address,
+		        scale: 18 ,// 缩放级别
+				complete: () => {
+				   uni.hideLoading()	
+				},
+				fail: (res) => {
+					console.log("==res",res);
+					uni.showToast({
+						title:'定位失败，请重试',
+						icon:'none'
+					})
+				}
+		      });
+	}
+
+
+	function onBackClick() {
+		uni.navigateBack()
+	}
+
+	
+	function getCinemafilmSchedList(){
+		uni.showLoading()
+		let params =
+		`film_sign=${moviesList.value[currentMoviesIndex.value].film_sign}&cinema_sign=${initInfo.value.cinema_sign}`
+		apiGetCinemafilmSchedList(params).then(res=>{
+	        dateList.value =  res.show_date
+			totalList.value = res.cinema_sched
+			cinemaList.value = res.cinema_sched[dateList.value[0].date]
+			uni.hideLoading()
+		})
+	}
+	
+	onPullDownRefresh(() => {
+		getCinemafilmSchedList()
+		uni.stopPullDownRefresh()
+	})
+	
+	
+</script>
+
+<style lang="scss" scoped>
+	.movies-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+		padding-top:870rpx ;
+		
+		.des-content{
+			display: flex;
+			flex-direction: row;
+			margin-bottom: 20rpx;
+			align-items: center;
+			.time-des{
+				font-size: 24rpx;
+				color:#999 ;
+			}
+			
+			.time-line{
+				height: 20rpx;
+				width: 1rpx;
+				background-color: #999;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+			}
+			.time-des-content{
+				max-width: 300rpx;
+				font-size: 24rpx;
+				color:#999 ;
+				  white-space: nowrap; /* 禁止文本换行 */
+				      overflow: hidden; /* 隐藏超出范围的内容 */
+				      text-overflow: ellipsis; /* 使用省略号 */
+			}
+		}
+		
+		.grade-content{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-top: 20rpx;
+			margin-bottom: 10rpx;
+			.title{
+				font-size: 28rpx;
+				color: #000;
+				font-weight: bolder;
+				margin-right: 20rpx;
+			}
+			.grade{
+				font-size: 28rpx;
+				color: #f44546;
+				font-weight: bolder;
+				margin-right: 20rpx;
+			}
+		}
+		
+		.address-content{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding: 38rpx 20rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			margin-left: 24rpx;
+			box-sizing: border-box;
+			margin-right: 24rpx;
+			justify-content: space-between;
+			z-index: 22;
+			box-shadow: 2px 2px 16px 0px rgba(31, 34, 37, 0.08);
+			
+			.address-info{
+				display: flex;
+				flex-direction: column;
+				
+				.shop-name{
+					font-size: 30rpx;
+					color: #000;
+					margin-bottom: 10rpx;
+					font-weight: bolder;
+				}
+				.shop-address{
+					font-size: 26rpx;
+					color: #666;
+					width: 560rpx;
+					 white-space: nowrap; /* 禁止文本换行 */
+					  overflow: hidden; /* 隐藏超出范围的内容 */
+					   text-overflow: ellipsis; /* 使用省略号 */
+				}
+			}
+			.address-icon{
+				width:90rpx;
+				height: 90rpx;
+			}
+			
+		}
+
+		.top-f-content {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			left: 0;
+			display: flex;
+			align-items: center;
+			z-index: 22;
+			flex-direction: column;
+			background-color: #fff;
+		}
+
+		.lab-content {
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			border-top-right-radius: 20rpx;
+			border-top-left-radius: 20rpx;
+			z-index: 9999999;
+
+			.lab-item {
+				display: flex;
+				flex-direction: row;
+				white-space: nowrap;
+				width: 100%;
+				padding-left: 20rpx;
+			}
+
+			.lab-item-x {
+				display: inline-block;
+				margin-right: 10px;
+				text-align: center;
+			}
+			
+			.movies-item{
+				width: 146rpx;
+				background-color: #df4743;
+				border-radius: 20rpx;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				height: 200rpx;
+			}
+
+			.lab-item-small {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 170rpx;
+
+				
+				.lab-default-title {
+					font-size: 26rpx;
+					color: #666;
+					margin-bottom: 10rpx;
+				}
+				
+				.lab-title {
+					font-size: 30rpx;
+					margin-bottom: 10rpx;
+					font-weight: bolder;
+					color: #000;
+				}
+
+				.lab-line {
+					width: 50rpx;
+					height: 6rpx;
+					background-color: #df4743;
+					border-radius: 4rpx;
+				}
+
+				.lab-default-line {
+					width: 50rpx;
+					height: 6rpx;
+					border-radius: 4rpx;
+				}
+
+			}
+		}
+		
+		
+		.movies-lab-content {
+			width: 100%;
+			margin-top: 30rpx;
+			height: 250rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			border-top-right-radius: 20rpx;
+			border-top-left-radius: 20rpx;
+			z-index: 9999999;
+		
+			.lab-item {
+				display: flex;
+				flex-direction: row;
+				white-space: nowrap;
+				width: 100%;
+				padding-left: 20rpx;
+			}
+		
+			.lab-item-x {
+				display: inline-block;
+				margin-right: 10px;
+				text-align: center;
+			}
+			
+			.movies-item{
+				width: 146rpx;
+				background-color: #f8f8f8;
+				border-radius: 20rpx;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				height: 200rpx;
+			}
+			.movies-big-item{
+				width: 178rpx;
+				background-color: #f8f8f8;
+				border-radius: 20rpx;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				height: 240rpx;
+			}
+		
+			.lab-item-small {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 170rpx;
+		
+				.lab-default-title {
+					font-size: 28rpx;
+					color: #666;
+					margin-bottom: 10rpx;
+				}
+		
+				.lab-title {
+					font-size: 32rpx;
+					margin-bottom: 10rpx;
+					color: #000;
+				}
+		
+				.lab-line {
+					width: 50rpx;
+					height: 6rpx;
+					background-color: #df4743;
+					border-radius: 4rpx;
+				}
+		
+				.lab-default-line {
+					width: 50rpx;
+					height: 6rpx;
+					border-radius: 4rpx;
+				}
+		
+			}
+		}
+
+		.img-ty {
+			width: 100%;
+			height: 318rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+
+		.top-content {
+			position: relative;
+			height: 348rpx;
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+		}
+
+
+		.top-title-content {
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-bottom: 20rpx;
+			justify-content: center;
+			position: relative;
+			z-index: 22;
+
+			.left-arrow {
+				width: 40rpx;
+				height: 40rpx;
+				position: absolute;
+				left: 0;
+				margin-left: 30rpx;
+			}
+
+			.title-name {
+				font-size: 28rpx;
+				color: #fff;
+			}
+		}
+
+		.list-item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding: 20rpx 14rpx;
+			margin-left: 20rpx;
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
+			border-radius: 20rpx;
+			background-color: #fff;
+			position: relative;
+			
+			.item-h{
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				align-items: center;
+			}
+			
+			.item-h-1{
+				display: flex;
+				flex: 2;
+				flex-direction: column;
+				margin-left: 20rpx;
+			}
+			
+			.item-time{
+				font-size:28rpx ;
+				font-weight: bolder;
+				margin-bottom: 10rpx;
+				color: #000;
+			}
+			
+			.item-price{
+				font-size:28rpx ;
+				font-weight: bolder;
+				color: #f44546;
+				margin-bottom: 10rpx;
+			}
+			
+			.item-price-unit{
+				font-size:22rpx ;
+				color: #999;
+				text-decoration: line-through;
+			}
+			.item-des{
+				font-size:22rpx ;
+				font-weight: bolder;
+				color: #999;
+			}
+			
+			.buy-btn{
+				height: 46rpx;
+				width: 94rpx;
+				border-radius: 46rpx;
+				border: 1rpx solid #f44546;
+				font-size: 28rpx;
+				color: #f44546;
+				margin-left: 10rpx;
+				margin-right: 10rpx;
+				line-height: 46rpx;
+				text-align: center;
+			}
+
+			
+			
+		}
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 电影专区
+  enablePullDownRefresh: true
+  navigationStyle: custom
+</route>

src/subPages/pages/movies/nearbyCinemas.vue

@@ -0,0 +1,549 @@
+<template>
+	<view class="movies-container">
+
+		<view class="top-f-content">
+			<image class="img-ty" :src="topMoviesInfo.cover_img" mode="aspectFill"></image>
+			<view class="top-content">
+				<view class="top-title-content" :style="navBarHeight">
+					<image @click="onBackClick" class="left-arrow" src="/static/icon/leftArrow.png" mode="widthFix"></image>
+					<text class="title-name">{{topMoviesInfo.film_name}}</text>
+				</view>
+
+				<view class="list-item">
+					<image class="item-img" :src="topMoviesInfo.cover_img" mode="aspectFill"></image>
+					<view class="info-item">
+						<view class="title-content">
+							<text class="item-title">{{topMoviesInfo.film_name}}</text>
+						</view>
+						<view class="title-content">
+							<text class="item-des">评分：</text>
+							<text class="item-red-des">{{topMoviesInfo.grade}}</text>
+						</view>
+						<view class="title-content">
+							<text class="item-des">导演：{{topMoviesInfo.director_name}}</text>
+						</view>
+						<view class="title-content-x">
+							<text class="item-des-x">主演：</text>
+							<text class="item-people-a">{{topMoviesInfo.actors_name}}</text>
+						</view>
+						<view class="title-content">
+							<text class="item-date">{{topMoviesInfo.publish_date}}</text>
+							<text class="item-des">上映</text>
+						</view>
+					</view>
+				</view>
+			</view>
+<!-- 
+			<view class="lab-content" v-if="dateList && dateList.length!=0">
+				<scroll-view scroll-x="true" class="lab-item">
+					<view class="lab-item-x" v-for="(item,index) in dateList" :key="'lab-item-x-'+index">
+						<view class="lab-item-small" @click="onTabClick(index)">
+							<text v-if="item.show_date" :class="currentIndex==index?'lab-title':'lab-default-title'">{{formatTimestamp(item.show_date)}} {{item.date}}</text>
+							<view :class="currentIndex==index?'lab-line':'lab-default-line'"></view>
+						</view>
+					</view>
+				</scroll-view>
+			</view> -->
+		</view>
+
+		<view @click="onItemClick(item)" class="list-item-x" v-for="(item,index) in cinemaList" :key="'movies-item-'+index">
+			<view class="info-item">
+				<view class="title-content">
+					<text class="item-title-x">{{item.cinema_name}}</text>
+					<!-- <view class="price-child-content">
+						<text class="item-price">￥{{item.price}}</text>
+						<text class="item-price-unit">起</text>
+					</view> -->
+
+				</view>
+				<view class="title-content">
+					<text class="item-people-s">{{item.address}}</text>
+					<text class="item-jl">{{item.distance}}km</text>
+				</view>
+			</view>
+		</view>
+		
+		 <CXBEmpty  v-if="cinemaList.length==0"></CXBEmpty>
+	</view>
+</template>
+
+<script setup>
+	import {
+		getLocal,
+	} from "~/apis/common";
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY,
+		USER_CHOOSE_CITY_CODE
+	} from '~/constants/index'
+
+	import {
+		apiGetFilmschedDate,
+		apiGetFilmSchedList
+	} from '~/apis/movies'
+	import {formatTimestamp} from "~/utils/util"
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
+	const searchKey = ref('')
+	const currentIndex = ref(0)
+	const cinemaList = ref([])
+	const currentCity = ref('请选择城市')
+	const title = ref('')
+	const topMoviesInfo = ref({})
+	const dateList = ref([])
+
+	const state = reactive({
+		page: 1,
+		limit: 10,
+		keyword: '',
+		count: 1,
+	})
+
+	const systemInfo = uni.getSystemInfoSync()
+	const statusBarHeight = systemInfo.statusBarHeight ?? 0
+	const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+
+	const navBarHeight = computed(() => {
+		return {
+			marginTop: `${menuButtonInfo.top}px`,
+			height: `${menuButtonInfo.bottom -menuButtonInfo.top}px`,
+		}
+	})
+
+	onLoad( (option) => {
+		let info = option.info
+		let type = option.type
+		
+		if (info) {
+			topMoviesInfo.value = JSON.parse(decodeURIComponent(info))
+			if(type==2){
+				uni.showModal({
+					showCancel:false,
+					title:'非常抱歉',
+					content:'该影片暂无排期,看看其他影片吧',
+					complete: (res) => {
+						console.log("===res",res);
+						if(res.confirm){
+							uni.navigateBack()
+						}
+					}
+				})
+			}else {
+								getFilmSchedList()
+				//getFilmschedDate()
+			}
+		}
+
+	})
+	
+	function onTabClick(position){
+		currentIndex.value = position
+		getFilmSchedList()
+	}
+
+	function onBackClick() {
+		uni.navigateBack()
+	}
+	
+	function onItemClick(item){
+		uni.navigateTo({
+			url:`/subPages/pages/movies/moviesTicketList?info=${encodeURIComponent(JSON.stringify(item))}&film_sign=${topMoviesInfo.value.film_sign}`
+		})
+	}
+
+	function getFilmschedDate() {
+		uni.showLoading()
+		apiGetFilmschedDate(topMoviesInfo.value.film_sign).then(res => {
+			dateList.value =res 
+			if(dateList.value && dateList.value.length!= 0){
+
+			}
+			uni.hideLoading()
+		})
+	}
+	
+	function getFilmSchedList(){
+			uni.showLoading()
+		let latitude = uni.getStorageSync(USER_LATITUDE)
+		let longitude = uni.getStorageSync(USER_LONGITUDE)
+		let cityCode = uni.getStorageSync(USER_CHOOSE_CITY_CODE)
+		let params =
+		`page=${state.page}&limit=${state.limit}&longitude=${longitude}&latitude=${latitude}&film_sign=${topMoviesInfo.value.film_sign}&city_sign=${cityCode}`
+		apiGetFilmSchedList(params).then(res=>{
+			state.count = res.count
+			if (state.page === 1) {
+				cinemaList.value = res.cinema_sched
+			} else {
+				cinemaList.value.push(...res.cinema_sched)
+			}
+			uni.hideLoading()
+		})
+	}
+	
+	onPullDownRefresh(() => {
+		state.page = 1
+		getFilmSchedList()
+		uni.stopPullDownRefresh()
+	})
+	
+	onReachBottom(() => {
+		if (cinemaList.value.length < state.count) {
+			state.page += 1
+			getFilmSchedList()
+		}
+	})
+	
+	
+</script>
+
+<style lang="scss" scoped>
+	.movies-container {
+		display: flex;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+		padding-top:490rpx ;
+
+		.top-f-content {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			left: 0;
+			z-index: 222;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.lab-content {
+			width: 100%;
+			height: 100rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			border-top-right-radius: 20rpx;
+			border-top-left-radius: 20rpx;
+			margin-top: -10rpx;
+			z-index: 9999999;
+			box-shadow: 2px 6px 16px 0px rgba(31, 34, 37, 0.12);
+
+			.lab-item {
+				display: flex;
+				flex-direction: row;
+				white-space: nowrap;
+				width: 100%;
+				padding-left: 20rpx;
+			}
+
+			.lab-item-x {
+				display: inline-block;
+				margin-right: 10px;
+				text-align: center;
+			}
+
+			.lab-item-small {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 170rpx;
+
+				.lab-default-title {
+					font-size: 26rpx;
+					color: #666;
+					margin-bottom: 10rpx;
+				}
+
+				.lab-title {
+					font-size: 30rpx;
+					margin-bottom: 10rpx;
+					font-weight: bolder;
+					color: #000;
+				}
+
+				.lab-line {
+					width: 50rpx;
+					height: 6rpx;
+					background-color: #df4743;
+					border-radius: 4rpx;
+				}
+
+				.lab-default-line {
+					width: 50rpx;
+					height: 6rpx;
+					border-radius: 4rpx;
+				}
+
+			}
+		}
+
+		.img-ty {
+			width: 100%;
+			height: 470rpx;
+		}
+
+		.top-content {
+			position: absolute;
+			top: 0%;
+			height: 470rpx;
+			left: 0%;
+			width: 100%;
+			background: rgba(0, 0, 0, 0.2);
+			backdrop-filter: blur(20rpx);
+			-webkit-backdrop-filter: blur(20rpx);
+		}
+
+
+		.top-title-content {
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+
+			.left-arrow {
+				width: 40rpx;
+				height: 40rpx;
+				position: absolute;
+				left: 0;
+				margin-left: 30rpx;
+			}
+
+			.title-name {
+				font-size: 28rpx;
+				color: #fff;
+			}
+		}
+
+		.list-item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding: 24rpx 40rpx;
+			position: relative;
+		}
+		
+		.list-item-x {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding: 20rpx 14rpx;
+			margin-left: 20rpx;
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
+			border-radius: 20rpx;
+			background-color: #fff;
+			position: relative;
+		
+			
+		}
+		.item-img {
+			width: 174rpx;
+			min-width: 174rpx;
+			height: 234rpx;
+			background-color: #f5f5f5;
+			margin-right: 22rpx;
+		}
+		
+		.right-btn {
+			width: 148rpx;
+			height: 64rpx;
+			margin-top: 40rpx;
+			line-height: 64rpx;
+			text-align: center;
+			background-color: #eb4340;
+			color: #fff;
+			font-size: 28rpx;
+			border-radius: 64rpx;
+			position: absolute;
+			right: 0;
+			font-weight: bolder;
+			margin-right: 26rpx;
+		}
+		
+		.right-black-btn {
+			width: 148rpx;
+			margin-top: 40rpx;
+			height: 64rpx;
+			line-height: 64rpx;
+			text-align: center;
+			border-radius: 64rpx;
+			background-color: #000;
+			color: #fff;
+			font-size: 28rpx;
+			font-weight: bolder;
+			position: absolute;
+			margin-right: 26rpx;
+			right: 0;
+		}
+		
+		.info-item {
+			display: flex;
+			flex-direction: column;
+			width: 100%;
+			
+			.title-content-x{
+				display: flex;
+				flex-direction: row;
+				margin-bottom: 12rpx;
+				position: relative;
+				width: 100%;
+				.item-people-a {
+					font-size: 22rpx;
+					color: #fff;
+					max-width: 550rpx;
+				    display: -webkit-box; /* 设置为WebKit内核的弹性盒子模型 */
+				     -webkit-box-orient: vertical; /* 垂直排列 */
+				     -webkit-line-clamp: 2; /* 限制显示两行 */
+				     overflow: hidden; /* 隐藏超出范围的内容 */
+				     text-overflow: ellipsis; /* 使用省略号 */
+				     text-indent: 66rpx;
+				}
+				.item-des-x {
+					font-size: 22rpx;
+					color: #fff;
+					min-width: 66rpx;
+					position: absolute;
+					left: 0;
+				}
+			}
+		
+			.title-content {
+				display: flex;
+				flex-direction: row;
+				margin-bottom: 12rpx;
+				position: relative;
+				align-items: center;
+				width: 100%;
+		
+				.item-title {
+					font-size: 32rpx;
+					font-weight: bolder;
+					color: #fff;
+					margin-right: 10rpx;
+					max-width: 370rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 隐藏溢出的内容 */
+					text-overflow: ellipsis;
+					/* 显示省略号来代表被修剪的文本 */
+				}
+		
+				.price-child-content {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					flex: 1;
+					justify-content: flex-end;
+				}
+		
+				.item-title-x {
+					font-size: 32rpx;
+					font-weight: bolder;
+					color: #333;
+					flex: 1;
+					margin-right: 10rpx;
+					max-width: 550rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 隐藏溢出的内容 */
+					text-overflow: ellipsis;
+					/* 显示省略号来代表被修剪的文本 */
+				}
+		
+				.item-people-s {
+					font-size: 22rpx;
+					color: #666;
+					max-width: 550rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 隐藏溢出的内容 */
+					text-overflow: ellipsis;
+					/* 显示省略号来代表被修剪的文本 */
+				}
+				
+		
+				.item-jl {
+					font-size: 22rpx;
+					color: #999;
+					flex: 1;
+					text-align: right;
+					line-height: 22rpx;
+					height: 22rpx;
+				}
+		
+				.item-price {
+					font-size: 26rpx;
+					color: #df4743;
+					font-weight: bolder;
+				}
+		
+				.item-price-unit {
+					font-size: 26rpx;
+					color: #999;
+					font-weight: bolder;
+				}
+		
+				.item-red-des {
+					font-size: 28rpx;
+					color: #df4743;
+					font-weight: bolder;
+				}
+		
+				.item-des {
+					font-size: 22rpx;
+					color: #fff;
+					min-width: 66rpx;
+				}
+				
+		
+				.item-date {
+					font-size: 22rpx;
+					color: #fff;
+				}
+		
+				.item-people {
+					font-size: 22rpx;
+					color: #fff;
+					max-width: 380rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 隐藏溢出的内容 */
+					text-overflow: ellipsis;
+					/* 显示省略号来代表被修剪的文本 */
+				}
+		
+				.item-people-x {
+					font-size: 22rpx;
+					color: #fff;
+					max-width: 370rpx;
+					white-space: nowrap;
+					/* 防止文本换行 */
+					overflow: hidden;
+					/* 隐藏溢出的内容 */
+					text-overflow: ellipsis;
+					/* 显示省略号来代表被修剪的文本 */
+				}
+		
+			}
+		}
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 电影专区
+  enablePullDownRefresh: true
+  navigationStyle: custom
+</route>

src/subPages/pages/movies/orderDetail.vue

@@ -0,0 +1,447 @@
+<template>
+	<view class="order-detail-container">
+
+		<view class="card-content">
+			<view class="top-info-content">
+				<view class="info-content">
+					<text class="info-title">{{detailInfo.film_name}}</text>
+					<text class="info-des" v-if="detailInfo&&detailInfo.film">{{detailInfo.sched_time}} ~ {{detailInfo.schedend_time}}({{detailInfo.film.language=='汉语普通话'?'国语':detailInfo.film.language}}{{detailInfo.film.version}})</text>
+					<text class="info-des">{{detailInfo.cinema_name}}{{detailInfo.hall_name}}</text>
+					
+					<view class="seat-content">
+						<text :key="'info-seat-'+index" class="info-seat"
+							v-for="(item,index) in detailInfo.sched_seat">{{item.seat_no}}</text>
+					</view>
+				
+						
+				</view>
+				<image v-if="detailInfo && detailInfo.film" class="info-img" :src="detailInfo.film.cover_img"
+					mode="aspectFill"></image>
+			</view>
+			<view class="order-line"></view>
+
+			<view class="order-status-content" v-if="detailInfo.status==0">
+				<text class="status-title">支付剩余 {{ formatTime(minutes) }}:{{ formatTime(seconds) }}</text>
+				<text class="status-hint"> 请尽快支付,否则订单将在10分钟后失效</text>
+			</view>
+			<view class="order-status-content"
+				v-if="detailInfo.status==3 || detailInfo.status==2|| detailInfo.status==5">
+				<text class="status-title"> 订单已取消</text>
+				<text class="status-hint"> 订单超时未支付,系统已自动关闭！</text>
+			</view>
+			<view class="order-status-content" v-if="detailInfo.status==1 || detailInfo.status==4">
+				<text class="status-title"> 取票码</text>
+				<view class="qr-content">
+					<image @click="onQrClick(index)" :key="'qr-icon-'+index" v-for="(item,index) in detailInfo.ticket"
+						class="order-qr" :src="item.qr_code" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+
+		<view class="card-content" @click="onAddressClick" v-if="detailInfo&& detailInfo.cinema">
+			<view class="address-out-content">
+				<text class="cinemas-name">{{detailInfo.cinema.cinema_name}}</text>
+				<text class="address-name">{{detailInfo.cinema.address}}</text>
+				<image @click.stop="onPhoneClick" class="phone-icon" src="/static/icon/phone_icon.png" mode="widthFix">
+				</image>
+			</view>
+		</view>
+
+		<view class="card-content" @click="onCopyClick">
+			<text class="cinemas-name">订单金额：￥{{detailInfo.order_price}}</text>
+			<view class="order-no-content">
+				<text class="card-small-des">订单编号：{{detailInfo.order_sn}}</text>
+				<image class="copy-icon" src="/static/icon/copy_icon.png" mode="widthFix"></image>
+			</view>
+			<text class="card-small-des">下单时间：{{formatDate(detailInfo.create_time,8,'-')}}</text>
+			<text class="card-small-des">手机号码：{{detailInfo.phone}}</text>
+		</view>
+
+
+		<view class="card-content">
+			<text class="cinemas-name">观影须知</text>
+			<text class="card-small-des">1.请提前到达影院现场,找到自助取票机,打印纸制电影票,完成取票。</text>
+			<text class="card-small-des">2.如现场自助取票机无法打印电影票,请联系影院工作人员处理。</text>
+			<text class="card-small-des">3.凭打印好的纸质电影票,检票入场观影。</text>
+			<text class="card-small-des">4.如有开具所够电影票发票的需求,请保留好电影票根,尽量在观影当天联系影城工作人员进行开具，如遇特殊情况请及时咨询平台客服。</text>
+		</view>
+
+
+		<view class="bottom-btn-content" v-if="detailInfo.status==0 &&detailInfo.order_price ">
+			<view class="left-content">
+				<view class="left-top-info">
+					<text class="pay-price-title">应付：</text>
+					<text class="pay-price">￥{{detailInfo.order_price}}</text>
+				</view>
+			</view>
+			<view class="right-btn" @click="onPayClick">立即付款</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY
+	} from '~/constants/index'
+
+	import {
+		apiGetOrderInfo,
+		apiConfirmOrder
+	} from '~/apis/movies'
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+	import {
+		formatDate
+	} from '~/utils/util'
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
+
+	let orderSn = ''
+	const formatTime = (num) => num < 10 ? `0${num}` : num
+	const detailInfo = ref({})
+	let totalTime = 600 // 5分钟=300秒
+	const count = ref(0)
+	const minutes = ref(0)
+	const seconds = ref(0)
+	let timer = null
+	onLoad((option) => {
+		orderSn = option.orderSn
+		if (orderSn != 'undefined') {
+			getorderDetailInfo()
+		}
+	})
+
+	function onAddressClick() {
+		uni.navigateTo({
+			url:`/subPages/pages/movies/moviesTicketList?info=${encodeURIComponent(JSON.stringify(detailInfo.value.cinema))}&film_sign=${detailInfo.value.film.film_sign}`
+		})
+	}
+
+	function initTimer() {
+		timer = setInterval(() => {
+			count.value--
+			updateCountdown()
+		}, 1000)
+	}
+
+	function onPayClick() {
+		console.log("===detailInfo",detailInfo.value.oid);
+		uni.redirectTo({
+			url: `/pages/payment/index?pay_price=${detailInfo.value.order_price}&order_id=${detailInfo.value.oid}&initType=3&order_sn=${detailInfo.value.order_sn}`
+		})
+	}
+
+	onUnmounted(() => {
+		clearInterval(timer)
+	})
+
+	// 更新倒计时
+	const updateCountdown = () => {
+		minutes.value = Math.floor(count.value / 60)
+		seconds.value = count.value % 60
+		if (count.value <= 0) {
+			clearInterval(timer)
+			// 可在此处触发回调事件
+			getorderDetailInfo()
+		}
+	}
+
+	function onPhoneClick() {
+		uni.makePhoneCall({
+			phoneNumber: detailInfo.value.cinema.tel
+		})
+	}
+
+	function onQrClick(index) {
+
+		let imgList = new Array()
+		for (let s of detailInfo.value) {
+			imgList.push(s.qr_code)
+		}
+		uni.previewImage({
+			urls: imgList,
+			current: imgList[index]
+		})
+	}
+
+	function onCopyClick() {
+		uni.setClipboardData({
+			data: detailInfo.value.order_sn,
+			success(res) {
+				uni.showToast({
+					title: `复制成功`,
+					icon: 'none'
+				})
+			},
+			fail(res) {
+				return uni.showToast({
+					title: '请更新隐私协议',
+					icon: 'none'
+				})
+			}
+		})
+	}
+
+	function getorderDetailInfo() {
+		uni.showLoading()
+		apiGetOrderInfo(orderSn).then(res => {
+			detailInfo.value = res
+			if (detailInfo.value.status == 0) {
+	     	totalTime = parseInt((detailInfo.value.create_time*1000+600000 -	new Date().getTime())/1000)
+			count.value = totalTime+2
+				initTimer()
+			}
+			uni.hideLoading()
+		}).catch((e)=>{
+			uni.showToast({
+				title:e.message ||'接口异常!',
+				icon:'none'
+			})
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-detail-container {
+		display: flex;
+		padding-bottom: 60rpx;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+		padding-top: 24rpx;
+		
+		.seat-content{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			flex-wrap: wrap;
+		}
+
+		.bottom-btn-content {
+			display: flex;
+			flex-direction: row;
+			height: 180rpx;
+			align-items: center;
+			z-index: 22;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			box-sizing: border-box;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
+			background-color: #fff;
+
+			.right-btn {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				color: #fff;
+				font-size: 30rpx;
+				background-color: #fc425a;
+				border-radius: 80rpx;
+				height: 80rpx;
+				width: 200rpx;
+			}
+
+			.left-content {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+
+				.price-hint {
+					font-size: 24rpx;
+					margin-top: 10rpx;
+					color: #999;
+				}
+
+				.left-top-info {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+
+					.pay-price-title {
+						font-size: 30rpx;
+						color: #333;
+					}
+
+					.pay-price {
+						font-size: 30rpx;
+						color: #f44546;
+						font-weight: bolder;
+					}
+				}
+
+			}
+		}
+
+		.card-content {
+			display: flex;
+			flex-direction: column;
+			background-color: #fff;
+			border-radius: 20rpx;
+			box-sizing: border-box;
+			margin-left: 24rpx;
+			margin-right: 24rpx;
+			margin-bottom: 24rpx;
+			padding: 24rpx;
+			position: relative;
+		}
+
+		.card-small-des {
+			font-size: 26rpx;
+			color: #999;
+			line-height: 30rpx;
+			margin-bottom: 10rpx;
+		}
+
+		.order-no-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.copy-icon {
+				width: 40rpx;
+				height: 40rpx;
+				margin-left: 10rpx;
+				margin-bottom: 10rpx;
+			}
+		}
+
+		.address-out-content {
+			display: flex;
+			flex-direction: column;
+			position: relative;
+			justify-content: center;
+		}
+
+		.cinemas-name {
+			font-size: 34rpx;
+			font-weight: bolder;
+			color: #000;
+			margin-bottom: 28rpx;
+		}
+
+		.phone-icon {
+			width: 36rpx;
+			height: 36rpx;
+			margin-left: 20rpx;
+			min-width: 50rpx;
+			position: absolute;
+			margin-left: 30rpx;
+			right: 0;
+		}
+
+		.address-name {
+			font-size: 24rpx;
+			color: #999;
+		}
+
+		.order-status-content {
+			display: flex;
+			flex-direction: column;
+			padding-top: 46rpx;
+			padding-bottom: 46rpx;
+			align-items: center;
+			justify-content: center;
+
+			.status-title {
+				font-size: 34rpx;
+				font-weight: bolder;
+				color: #df4743;
+				margin-bottom: 38rpx;
+			}
+
+			.status-hint {
+				font-size: 24rpx;
+				color: #999;
+			}
+
+			.qr-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				flex-wrap: wrap;
+				padding-left: 10rpx;
+				padding-right: 10rpx;
+			}
+
+			.order-qr {
+				width: 120rpx;
+				height: 120rpx;
+				margin-right: 10rpx;
+				margin-bottom: 20rpx;
+				margin-left: 10rpx;
+				background-color: #999;
+			}
+		}
+
+		.order-line {
+			height: 1rpx;
+			width: 100%;
+			border: 1rpx dotted #eeeeee;
+			margin-top: 30rpx;
+		}
+
+
+
+		.top-info-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+
+			.info-content {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+
+				.info-title {
+					font-size: 38rpx;
+					font-weight: bolder;
+					color: #000;
+					margin-bottom: 10rpx;
+					// white-space: nowrap;
+					// overflow: hidden;
+					// text-overflow: ellipsis;
+				}
+
+				.info-des {
+					font-size: 24rpx;
+					color: #666;
+					margin-top: 20rpx;
+				}
+
+				.info-seat {
+					font-size: 24rpx;
+					margin-top: 20rpx;
+					color: #999;
+					margin-right: 10rpx;
+				}
+			}
+
+			.info-img {
+				width: 156rpx;
+				height: 200rpx;
+				background-color: aqua;
+				border-radius: 20rpx;
+				margin-left: 24rpx;
+			}
+
+		}
+
+
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 订单详情
+</route>

src/subPages/pages/movies/orderList.vue

@@ -0,0 +1,592 @@
+<template>
+	<view class="movies-container">
+
+		<view class="top-content">
+			<view class="tab-content">
+				<view class="tab-item" @click="onTabClick(0)">
+					<text :class="currentIndex==0?'tab-title':'tab-default-title'">全部</text>
+					<view :class="currentIndex==0?'tab-line':'tab-default-line'"></view>
+				</view>
+				<view class="tab-item" @click="onTabClick(1)">
+					<text :class="currentIndex==1?'tab-title':'tab-default-title'">已出票</text>
+					<view :class="currentIndex==1?'tab-line':'tab-default-line'"></view>
+				</view>
+				<view class="tab-item" @click="onTabClick(2)">
+					<text :class="currentIndex==2?'tab-title':'tab-default-title'">已取消</text>
+					<view :class="currentIndex==2?'tab-line':'tab-default-line'"></view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="cinemaList && cinemaList.length!= 0">
+			<view class="list-item-out" v-for="(item,index) in cinemaList" :key="'movies-item-'+index"
+				@click="onItemClick(item)">
+
+				<view class="list-item">
+
+					<image class="item-img" :src="item.cover_img" mode="aspectFill"></image>
+					<view class="info-item">
+						<view class="title-content">
+							<text class="item-title">{{item.film_name}}</text>
+						</view>
+
+						<view class="title-content">
+							<text class="item-des">{{item.cinema_name}}</text>
+						</view>
+						<view class="title-content">
+							<text class="item-des">观影时间：{{item.show_date}} {{item.show_time}}</text>
+
+						</view>
+						<view class="title-content">
+							<text class="item-date">4DX</text>
+							<text class="item-date">{{item.hall_name}}</text>
+							<text :key="'seat-item-'+index" class="item-seat" v-for="(childItem,childIndex) in item.sched_seat">{{childItem.seat_no}}</text>
+						</view>
+						<view class="title-content">
+							<text class="item-date-s">实付款</text>
+							<text class="item-date-big">￥{{item.order_price}}</text>
+							<text class="item-date-x">({{item.number}}张)</text>
+						</view>
+					</view>
+				</view>
+				<view class="card-line"></view>
+				
+				<view class="card-bottom-content">
+					<text class="card-date">{{item.create_time}}</text>
+					<text class="card-status">{{dealStatus(item.status)}}</text>
+				</view>
+			</view>
+		</view>
+		
+		 <CXBEmpty  v-else ></CXBEmpty>
+	</view>
+</template>
+
+<script setup>
+	import {
+		getLocal,
+	} from "~/apis/common";
+	import {
+		USER_LATITUDE,
+		USER_LONGITUDE,
+		USER_CHOOSE_CITY
+	} from '~/constants/index'
+   import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+	import {
+		apiGetOrderList,
+	} from '~/apis/movies'
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+	import {
+		IMG_CDN_URL
+	} from '~/config/app.ts'
+	const searchKey = ref('')
+	const currentIndex = ref(0)
+	const cinemaList = ref([])
+	const currentCity = ref('请选择城市')
+
+	const state = reactive({
+		page: 1,
+		limit: 10,
+		keyword: '',
+		count: 1,
+	})
+
+	onLoad((option) => {
+		currentIndex.value = option.type
+		getmoviesOrderList()
+	})
+
+	function onItemClick(item) {
+		uni.navigateTo({
+			url: `/subPages/pages/movies/orderDetail?orderSn=${item.order_sn}`
+		})
+	}
+	
+	function dealStatus(status){
+		let name 
+		if(status==0){
+			name='待支付'
+		}else if(status==1){
+			name='已支付'
+		}else if(status==2){
+			name='已超时'
+		}else if(status==3 || status==5){
+			name='已取消'
+		}else if(status==4){
+			name='已成功'
+		}
+		return name
+	}
+	
+
+	function getmoviesOrderList() {
+		uni.showLoading()
+		let params =
+			`page=${state.page}&limit=${state.limit}&type=${currentIndex.value==0?-1:(currentIndex.value==2?5:1)}`
+		apiGetOrderList(params).then(res => {
+			state.count = res.count
+			if (state.page === 1) {
+				cinemaList.value = res.movie_order
+			} else {
+				cinemaList.value.push(...res.movie_order)
+			}
+			uni.hideLoading()
+		}).catch(()=>{
+			uni.hideLoading()
+			uni.showToast({
+				title:'接口异常!',
+				icon:'none'
+			})
+		})
+	}
+
+	function onTabClick(position) {
+		currentIndex.value = position
+		state.page = 1
+		state.count = 1
+		searchKey.value = ''
+		getmoviesOrderList()
+	}
+
+	onPullDownRefresh(() => {
+		state.page = 1
+		getmoviesOrderList()
+		uni.stopPullDownRefresh()
+	})
+
+	onReachBottom(() => {
+		if (cinemaList.value.length < state.count) {
+			state.page += 1
+			getmoviesOrderList()
+		}
+	})
+</script>
+
+<style lang="scss" scoped>
+	.movies-container {
+		display: flex;
+		padding-bottom: 60rpx;
+		flex-direction: column;
+		min-height: 100VH;
+		background-color: #f8f8f8;
+		box-sizing: border-box;
+		position: relative;
+		padding-top: 90rpx;
+
+		.top-content {
+			display: flex;
+			flex-direction: column;
+			position: fixed;
+			top: 0;
+			width: 100%;
+			z-index: 66;
+			left: 0;
+		}
+		
+		.card-line{
+			width: 100%;
+			height: 1rpx;
+			background-color: #eeeeee;
+			margin-top: 24rpx;
+			margin-bottom: 24rpx;
+		}
+		
+		.card-bottom-content{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			
+			.card-date{
+				font-size: 28rpx;
+				color: #999;
+				flex: 1;
+			}
+			.card-status{
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+
+		.list-item-out {
+			display: flex;
+			flex-direction: column;
+			padding: 24rpx 18rpx;
+			background-color: #fff;
+			margin-top: 24rpx;
+			border-radius: 10rpx;
+			position: relative;
+			margin-left: 22rpx;
+			margin-right: 22rpx;
+		}
+
+		.list-item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			
+
+			.item-img {
+				width: 174rpx;
+				min-width: 174rpx;
+				height: 234rpx;
+				background-color: #f5f5f5;
+				border-radius: 20rpx;
+				margin-right: 22rpx;
+			}
+
+			.right-btn {
+				width: 148rpx;
+				height: 64rpx;
+				margin-top: 40rpx;
+				line-height: 64rpx;
+				text-align: center;
+				background-color: #eb4340;
+				color: #fff;
+				font-size: 28rpx;
+				border-radius: 64rpx;
+				position: absolute;
+				right: 0;
+				font-weight: bolder;
+				margin-right: 26rpx;
+			}
+
+			.right-black-btn {
+				width: 148rpx;
+				margin-top: 40rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				border-radius: 64rpx;
+				background-color: #000;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: bolder;
+				position: absolute;
+				margin-right: 26rpx;
+				right: 0;
+			}
+
+			.info-item {
+				display: flex;
+				flex-direction: column;
+				width: 100%;
+
+				.title-content {
+					display: flex;
+					flex-direction: row;
+					margin-bottom: 12rpx;
+					align-items: center;
+					flex-wrap: wrap;
+					width: 100%;
+
+					.item-title {
+						font-size: 32rpx;
+						font-weight: bolder;
+						color: #333;
+						margin-right: 10rpx;
+						max-width: 370rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.price-child-content {
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						flex: 1;
+						justify-content: flex-end;
+					}
+
+					.item-title-x {
+						font-size: 32rpx;
+						font-weight: bolder;
+						color: #333;
+						flex: 1;
+						margin-right: 10rpx;
+						max-width: 550rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-people-s {
+						font-size: 22rpx;
+						color: #666;
+						max-width: 550rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-jl {
+						font-size: 22rpx;
+						color: #999;
+						flex: 1;
+						text-align: right;
+						line-height: 22rpx;
+						height: 22rpx;
+					}
+
+					.item-price {
+						font-size: 26rpx;
+						color: #df4743;
+						font-weight: bolder;
+					}
+
+					.item-price-unit {
+						font-size: 26rpx;
+						color: #999;
+						font-weight: bolder;
+					}
+
+					.item-red-des {
+						font-size: 28rpx;
+						color: #df4743;
+						font-weight: bolder;
+					}
+
+					.item-des {
+						font-size: 22rpx;
+						color: #999;
+					}
+
+					.item-date-x {
+						font-size: 24rpx;
+						color: #df4743;
+						margin-left: 4rpx;
+					}
+
+					.item-date-s {
+						font-size: 24rpx;
+						color: #666;
+					}
+
+					.item-date-big {
+						font-size: 28rpx;
+						color: #000;
+						font-weight: bolder;
+					}
+
+					.item-date {
+						font-size: 22rpx;
+						color: #666;
+						font-weight: bolder;
+					}
+					
+					.item-seat {
+						font-size: 22rpx;
+						color: #666;
+						margin-left: 4rpx;
+						margin-right: 4rpx;
+					}
+
+					.item-people {
+						font-size: 22rpx;
+						color: #999;
+						max-width: 240rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-people-x {
+						font-size: 22rpx;
+						color: #999;
+						max-width: 370rpx;
+						white-space: nowrap;
+						/* 防止文本换行 */
+						overflow: hidden;
+						/* 隐藏溢出的内容 */
+						text-overflow: ellipsis;
+						/* 显示省略号来代表被修剪的文本 */
+					}
+
+					.item-tag-content {
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						height: 32rpx;
+						border: 1rpx solid #999999;
+						border-radius: 6rpx;
+
+						.item-tag-0 {
+							font-size: 16rpx;
+							color: #fff;
+							height: 32rpx;
+							background-color: #999;
+							padding-right: 6rpx;
+							padding-left: 6rpx;
+							line-height: 32rpx;
+							text-align: center;
+						}
+
+						.item-tag-1 {
+							font-size: 16rpx;
+							color: #999;
+							height: 32rpx;
+							padding-left: 6rpx;
+							padding-right: 6rpx;
+							line-height: 32rpx;
+							text-align: center;
+						}
+					}
+				}
+			}
+		}
+
+		.tab-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			background-color: #fff;
+
+			.tab-item {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				align-items: center;
+				position: relative;
+				padding-top: 20rpx;
+
+				.tab-title {
+					font-size: 34rpx;
+					color: #333;
+					font-weight: bolder;
+					margin-bottom: 30rpx;
+				}
+
+				.tab-default-title {
+					font-size: 32rpx;
+					color: #666;
+					font-weight: bolder;
+					margin-bottom: 30rpx;
+				}
+
+				.tab-default-line {
+					width: 40rpx;
+					height: 10rpx;
+					background-color: #fff;
+					position: absolute;
+					bottom: 0;
+					border-radius: 10rpx;
+					margin-bottom: 10rpx;
+				}
+
+				.tab-line {
+					width: 40rpx;
+					height: 10rpx;
+					background-color: #ff0000;
+					position: absolute;
+					bottom: 0;
+					margin-bottom: 10rpx;
+					border-radius: 10rpx;
+				}
+			}
+		}
+
+		.fuc-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			padding-top: 20rpx;
+			padding-bottom: 30rpx;
+			justify-content: space-around;
+
+			.fuc-item {
+				display: flex;
+				flex-direction: column;
+				flex: 1;
+				align-items: center;
+				justify-content: center;
+
+				.fuc-icon {
+					width: 50rpx;
+					height: 54rpx;
+				}
+
+				.fuc-title {
+					color: #333;
+					font-size: 24rpx;
+					margin-top: 24rpx;
+				}
+			}
+		}
+
+		.head-content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #fff;
+			padding-top: 20rpx;
+			padding-bottom: 20rpx;
+
+			.city-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+
+				.city-name {
+					font-size: 32rpx;
+					color: #333;
+					padding-left: 30rpx;
+					font-weight: bolder;
+					margin-right: 12rpx;
+				}
+
+				.down-arrow {
+					width: 24rpx;
+					height: 18rpx;
+				}
+			}
+
+			.search-content {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				background-color: #f5f5f5;
+				height: 60rpx;
+				flex: 1;
+				border-radius: 60rpx;
+				padding-left: 20rpx;
+				margin-left: 24rpx;
+				padding-right: 20rpx;
+				box-sizing: border-box;
+				margin-right: 30rpx;
+
+				.search-icon {
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.input-ty {
+					font-size: 26rpx;
+					color: #333;
+					padding-left: 20rpx;
+				}
+			}
+		}
+	}
+</style>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 影票订单
+  enablePullDownRefresh: true
+</route>

src/subPages/pages/my-profile/index.vue

@@ -101,7 +101,8 @@ function handleSubmit() {
     sex: formData.sex,
     // birthday: formData.birthday,
     birthday: currentDate.value,
-    mark: formData.mark
+    mark: formData.mark,
+	phone: formData.phone
   }).then(res => {
     if (res) {
       uni.showToast({

src/subPages/pages/quick-fuc/business.vue

@@ -10,20 +10,20 @@
 				</view>
 			</scroll-view>
 		</view>
-		
+
 		<view class="banner-content">
 			<image class="top-banner" :src="topBanner" mode="aspectFill"></image>
 		</view>
 		<view class="fuc-content">
-			<view @click="onFucClick" class="fuc-item" v-for="(item,index) in MU_TABLE_LIST" :key="'fuc-item-'+index">
+			<view @click="onFucClick(index)" class="fuc-item" v-for="(item,index) in MU_TABLE_LIST"
+				:key="'fuc-item-'+index">
 				<text class="item-title">{{item.title}}</text>
 				<text class="item-des">{{item.des}}</text>
 				<image class="item-img" :src="item.icon" mode=""></image>
 			</view>
 		</view>
 		<view v-if="goodsList&& goodsList.length!=0" v-for="(item,index) in goodsList" :key="'goods-x-'+index">
-			<view class="vip-content" v-if="item.childList&& item.childList.length!=0"
-				@click="goShopClick(item.mer_id)">
+			<view class="vip-content" @click="goShopClick(item.mer_id)">
 				<image class="vip-bg" :src="vipBg" mode="aspectFill"></image>
 				<view class="left-lab-content">
 					<image class="lab-icon" :src="item.mer_avatar" mode="widthFix"></image>
@@ -38,22 +38,23 @@
 			<view class="goods-scoll-content">
 				<scroll-view scroll-x="true" class="goods-scoll-item">
 					<view @click="onDetailClick(childItem.product_id)" class="goods-scoll-item-x"
-						v-for="(childItem,childIndex) in item.childList" :key="'goods-scoll-item-x-'+childIndex">
+						v-for="(childItem,childIndex) in item.goods_list" :key="'goods-scoll-item-x-'+childIndex">
 						<view class="goods-item">
 							<image class="goods-img" :src="childItem.image" mode="aspectFill"></image>
 							<text class="goods-title">{{childItem.store_name}}</text>
 							<view class="price-content">
+								<text class="ylj-content">养老金￥{{childItem.yanglao}}</text>
+							</view>
+							<view class="price-content">
 								<text class="price-left">￥{{childItem.price}}</text>
-								<text class="price-rifht">￥{{childItem.ot_price}}</text>
-								<!-- <text class="goods-des">pv:{{childItem.pv?childItem.pv:0}}</text> -->
 							</view>
 						</view>
 					</view>
 				</scroll-view>
 			</view>
-			
+
 		</view>
-		
+
 		<CXBEmpty v-else />
 	</view>
 </template>
@@ -65,31 +66,47 @@
 	import {
 		apiGetCategoryList,
 		apiGetProductType,
-		apiGetProductList
+		apiGetProductList,
+		apiGetCommerceList
 	} from '~/apis/quickLink'
+	import {apiGetUserToken} from '~/apis/user'
 	import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
-	import { getProductShare } from "~/apis/common";
-	import { useUserStore } from '~/stores/userStore'
-	import{IMG_CDN_URL} from '~/config/app.ts'
+	import {
+		getProductShare
+	} from "~/apis/common";
+	import {
+		useUserStore
+	} from '~/stores/userStore'
+	import {
+		IMG_CDN_URL,
+		BASE_URL
+	} from '~/config/app.ts'
+	
 	const currentIndex = ref(0)
 	const tabList = ref([])
 	const goodsList = ref([])
-	const topBanner =ref(`${IMG_CDN_URL}img_banner_dslm.png`)
-	const vipBg =ref(`${IMG_CDN_URL}item_smq_bg.png`)
-	let id=''
-
+	const topBanner = ref(`${IMG_CDN_URL}img_banner_dslm.png`)
+	const vipBg = ref(`${IMG_CDN_URL}item_smq_bg.png`)
+	const userTokenInfo = ref()
+	const itemList =ref([])
+	
+	const state = reactive({
+		pageSize: 10,
+		page: 1,
+		limit: 10,
+		cid: 0,
+	})
 
 	onLoad((option) => {
-		console.log();
+		getUserToken()
 		getCategoryList()
-		getProductType()
+		getCommerceList()
 		if (option && option.shareId) {
-		  userStore.setShareId(option.shareId)
+			userStore.setShareId(option.shareId)
 		}
 		getProductShare().then(res => {
-		  if (res) userStore.setShareId(res.share_id)
-		}).catch(message => {
-		})
+			if (res) userStore.setShareId(res.share_id)
+		}).catch(message => {})
 	})
 
 	onShareAppMessage(() => {
@@ -112,18 +129,19 @@
 
 	onReachBottom(() => {
 		console.log('到底了。。。')
-		
+        state.page += 1
+       getProduct()
 	})
 
 	onPullDownRefresh(() => {
-		getProductType()
+		getCommerceList()
 		uni.stopPullDownRefresh()
 	})
 
 	function onTabClick(position, id) {
 		currentIndex.value = position
-		id.value = id
-		getProductType()
+		state.cid = id
+		getCommerceList()
 	}
 
 	function goShopClick(id) {
@@ -133,17 +151,73 @@
 	}
 
 	function onDetailClick(id) {
+		console.log("==onDetailClick");
 		uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${id}`
+			url: `/subPages/pages/store/product/detail?id=${id}&initType=2`
 		})
 	}
-
-	function onFucClick() {
-		uni.showToast({
-			title: '升级中',
-			icon: 'none'
+	
+	function getUserToken() {
+		apiGetUserToken().then(res => {
+			userTokenInfo.value = res
 		})
 	}
+	
+
+	function onFucClick(position) {
+
+		if (position == 0 || position == 3) {
+
+			if (uni.getStorageSync('UID')) {
+				let _token = userTokenInfo.value
+				let params = {
+					x_token: _token.mweb_info.x_token,
+					storeStaff: _token.mweb_info.storeStaff,
+					user: {
+						account: _token.mweb_info.user.account,
+						pwd: _token.mweb_info.user.pwd,
+						uid: _token.mweb_info.user.uid,
+						user_number: _token.mweb_info.user.user_number,
+						user_type: _token.mweb_info.user.user_type,
+						wechat_user_id: _token.mweb_info.user.wechat_user_id,
+						mer_id: _token.mweb_info.user.mer_id,
+					}
+				}
+
+				let url = `${BASE_URL}/mweb/#/?data=${encodeURIComponent(JSON.stringify(params))}`
+				let info = {
+					url: url,
+					name: '店铺管理'
+				}
+				uni.navigateTo({
+					url: `/subPages/pages/mine-top/common-webView?info=${encodeURIComponent(JSON.stringify(info))}`
+				})
+			}else {
+				uni.showToast({
+					title:'请登录！',
+					icon:'none'
+				})
+				setTimeout(()=>{
+					pageStore.setPageConfig({
+						currentPage: {
+							type: 'tab',
+							url: '/pages/home/index'
+						}
+					})
+					return uni.redirectTo({
+						url: '/pages/user/login/index'
+					})
+				},300)
+			
+			}
+		} else {
+			uni.showToast({
+				title: '升级中',
+				icon: 'none'
+			})
+		}
+
+	}
 
 	function getCategoryList() {
 		apiGetCategoryList().then((res) => {
@@ -158,30 +232,22 @@
 			tabList.value = _list
 		})
 	}
-
-	function getProductType() {
+	
+	function getCommerceList(){
 		uni.showLoading({
-			title:'加载中...'
+			title: '加载中...'
 		})
-		apiGetProductType(id.value).then((res) => {
-			if (res && res.pageInfo && res.pageInfo.list) {
-				goodsList.value = res.pageInfo.list
-				dealData()
+		apiGetCommerceList(state.cid,state.page).then(res=>{
+			if (state.page === 1) {
+				goodsList.value = res.list
+			} else {
+			   goodsList.value.push(...res.list)
 			}
-			uni.hideLoading()
-		})
+		}).finally(()=>{uni.hideLoading()})
 	}
 
-	function dealData() {
-		for (let i = 0; i < goodsList.value.length; i++) {
-			let _id = goodsList.value[i].mer_id
-			apiGetProductList(_id).then(resx => {
-				if (resx.list && resx.list.length != 0) {
-					goodsList.value[i].childList = resx.list
-				}
-			})
-		}
-	}
+
+	
 </script>
 
 <style lang="scss" scoped>
@@ -193,6 +259,18 @@
 		background-color: #f8f8f8;
 		box-sizing: border-box;
 
+		.ylj-content {
+			height: 34rpx;
+			line-height: 34rpx;
+			text-align: left;
+			background-color: #eeeeee;
+			padding: 10rpx;
+			color: #666;
+			border-radius: 10rpx;
+			font-size: 24rpx;
+
+		}
+
 		.goods-content {
 			display: flex;
 			flex-direction: row;
@@ -214,7 +292,7 @@
 
 			.goods-img {
 				width: 300rpx;
-				height: 230rpx;
+				height: 320rpx;
 				border-top-right-radius: 20rpx;
 				border-top-left-radius: 20rpx;
 				background-color: #999;
@@ -235,7 +313,6 @@
 			.price-content {
 				margin-top: 10rpx;
 				display: flex;
-				margin-bottom: 20rpx;
 				flex-direction: row;
 				align-items: center;
 				padding-left: 16rpx;
@@ -247,6 +324,7 @@
 					font-size: 26rpx;
 					color: #333;
 					margin-right: 10rpx;
+					margin-bottom: 20rpx;
 				}
 
 				.price-rifht {
@@ -265,6 +343,7 @@
 			height: 100rpx;
 			display: flex;
 			flex-direction: row;
+			justify-content: space-between;
 			align-items: center;
 			box-sizing: border-box;
 
@@ -280,9 +359,7 @@
 				display: flex;
 				flex-direction: row;
 				align-items: center;
-				flex: 1;
 				z-index: 22;
-				justify-content: flex-end;
 
 				.right-tx {
 					color: #fff;
@@ -293,7 +370,7 @@
 				.right-icon {
 					width: 14rpx;
 					height: 10rpx;
-					margin-right: 20rpx;
+					margin-right: 30rpx;
 				}
 			}
 

src/subPages/pages/quick-fuc/components/life-product.vue

@@ -11,6 +11,10 @@
 		pageType:{
 			type:Number,
 			default:0
+		},
+		initType:{
+			type:Number,
+			default:0
 		}
 	})
 	
@@ -22,7 +26,7 @@
 	
 	function handleProductItemClick(item) {
 		 uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}&type=${props.pageType}`
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}&type=${props.pageType}&initType=${props.initType}`
 		})
 	}
 </script>
@@ -36,25 +40,29 @@
 				<text class="card-title line-clamp-2">{{item.store_name}}</text>
 			</view>
 
-			<!-- <view class="shop-content">
-				<image class="shop-icon" src="/static/icon/icon_shop_name.png" mode="widthFix"></image>
-				<text class="shop-name">{{item.shopName}}</text>
-			</view> -->
-              
+              <view class="annuity-content" v-if="item.pv && initType!=3 && initType!=0">
+              	<text  class="annuity-value">pv:{{dealNum(item.pv+'')}}</text>
+              </view>
 				
-			<view class="annuity-content" v-if="item.yanglao">
+			<view class="annuity-content" v-if="item.yanglao  && initType!=0">
 				 <text  class="annuity-value-x">养老金:￥{{dealNum(item.yanglao+'')}}</text>
 			</view>
-			<view class="annuity-content" v-if="item.pv">
-				<text  class="annuity-value">pv:{{dealNum(item.pv+'')}}</text>
+		
+			<view class="annuity-content" v-if="item.yanglao && initType==0">
+				 <text  class="annuity-value-x-0">养老金:￥{{dealNum(item.yanglao+'')}}</text>
 			</view>
+			
+			<view class="annuity-content" v-if="item.pv && initType==0">
+			  	<text  class="annuity-value-0">pv:{{dealNum(item.pv+'')}}</text>
+			</view>
+				
 
 			<view class="price-content">
-				<text class="price">{{item.price}}</text>
+				<text :class="initType==0?'price-s':'price'">{{item.price}}</text>
 				<text class="price-x">{{item.ot_price}}</text>
 				<view v-if="pageType==0" class="jf-content">积分</view>
 				<view v-if="pageType==0" class="jd-content">京豆</view>
-				<text v-if="pageType==1"  class="sell">已售{{item.sales}}件</text>
+				<text v-if="pageType==1 && initType!=3"  class="sell">已售{{item.sales}}</text>
 			</view>
 
 		</view>
@@ -88,6 +96,13 @@
 				.price {
 					font-size: 28rpx;
 					font-weight: bolder;
+					color: #333;
+					margin-left: 20rpx;
+					margin-right: 10rpx;
+				}
+				.price-s {
+					font-size: 28rpx;
+					font-weight: bolder;
 					color: #F83554;
 					margin-left: 20rpx;
 					margin-right: 10rpx;
@@ -125,22 +140,42 @@
 				}
 			}
             .annuity-value {
-            	background-color: antiquewhite;
-            	color: #F83554;
-            	font-size: 24rpx;
+            	background-color: #fe0032;
+            	color: #fff;
+            	font-size: 26rpx;
             	border-radius: 4rpx;
-            	padding-left: 4rpx;
-            	padding-right: 4rpx;
+            	padding: 4rpx 6rpx;
             }
             .annuity-value-x {
-            	background-color: #faf0f1;
-            	color: #F83554;
+            	background-color: #f5f5f5;
+            	color: #333;
 				display: flex;
-            	font-size: 24rpx;
+            	font-size: 26rpx;
             	border-radius: 4rpx;
-            	padding-left: 4rpx;
-            	padding-right: 4rpx;
+            	padding: 4rpx 6rpx;
             }
+			
+			
+			
+			.annuity-value-0 {
+				background-color: #f5f5f5;
+				color: #F83554;
+				font-size: 24rpx;
+				border-radius: 4rpx;
+				padding-left: 4rpx;
+				padding-right: 4rpx;
+			}
+			.annuity-value-x-0 {
+				background-color: #ffefef;
+				color: #F83554;
+				font-size: 24rpx;
+				border-radius: 4rpx;
+				padding-left: 4rpx;
+				padding-right: 4rpx;
+			}
+			
+			
+			
 			.annuity-content {
 				display: flex;
 				margin-left: 20rpx;

src/subPages/pages/quick-fuc/life.vue

@@ -38,7 +38,7 @@
 		
 		<CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
 		
-		<ProductList :list="pageList" v-if="pageList && pageList.length!=0" />
+		<ProductList :initType ='1' :list="pageList" v-if="pageList && pageList.length!=0" />
 		
         <CXBEmpty v-else></CXBEmpty>
 		
@@ -176,7 +176,7 @@
 
 	function handleItemClick(item) {
 		uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}&initType=1`
 		})
 	}
 

src/subPages/pages/quick-fuc/repurchase.vue

@@ -38,7 +38,7 @@
 		
 		<CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
 		
-		<ProductList :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
+		<ProductList :initType='3' :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
 		
         <CXBEmpty v-else></CXBEmpty>
 		
@@ -177,7 +177,7 @@
 	function handleItemClick(item) {
 		console.log("===item",item);
 		uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}type=1`
+			url: `/subPages/pages/store/product/detail?id=${item.product_id}&type=1&initType=3`
 		})
 	}
 
@@ -216,7 +216,7 @@
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 精彩生活
+  navigationBarTitleText: 复购区
   enablePullDownRefresh: true
 </route>
 

src/subPages/pages/quick-fuc/shop.vue

@@ -5,7 +5,7 @@
 		<view class="title-content" :style="titleContentStyle">
 			<view class="title-info">
 				<image @click="onBackClick" class="left-icon" src="/static/icon/left_arrow.png" mode="widthFix"></image>
-				<text class="top-title">京东</text>
+				<text class="top-title">{{topTitle}}</text>
 			</view>
 		</view>
 		<view class="top-block-content" :style="navBarStyle">
@@ -65,6 +65,7 @@
 		title: '',
 		type: '',
 	})
+	const topTitle =ref('')
 	const navBarStyle = ref('')
 	const titleContentStyle = ref('')
 	const pageList = ref([])
@@ -94,6 +95,7 @@
 		}else if(state.type==KINGKONGKEY.SN){//苏宁易购
 			_title='苏宁易购'
 		}
+		topTitle.value = _title
 		uni.setNavigationBarTitle({
 			title: _title // 设置新的导航栏标题
 		});

src/subPages/pages/quick-fuc/vip.vue

@@ -27,7 +27,7 @@
 		
 		<CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
 		
-		<ProductList :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
+		<ProductList :initType='0' :list="pageList" :pageType='1' v-if="pageList && pageList.length!=0" />
 		
         <CXBEmpty v-else></CXBEmpty>
 		
@@ -148,11 +148,7 @@
 		}
 	})
 
-	function handleItemClick(item) {
-		uni.navigateTo({
-			url: `/subPages/pages/store/product/detail?id=${item.product_id}`
-		})
-	}
+
 
 	function clearSearch() {
 		state.page = 1

src/subPages/pages/record-detail/detail.vue

@@ -8,9 +8,13 @@
 			</view>
 			<view class="page-line"></view>
 			<text class="item-title">交易信息</text>
+		<view class="child-item">
+			<text class="child-item-title">来源</text>
+			<text class="child-item-value">{{dealType(dataInfo.type)}}</text>
+		</view>
 			<view class="child-item">
 				<text class="child-item-title">提现状态</text>
-				<text :class="dataInfo.status==0?'child-item-or-value':'child-item-value'">{{ dataInfo.status == '-1' ? '已失败' : (dataInfo.status == '0' ? '提现中' : dataInfo.status == '1'? '已到账' : '')}}</text>
+				<text :class="dataInfo.status==0?'child-item-or-value':(dataInfo.status==-1?'child-item-red-value':'child-item-value')">{{ dataInfo.status == '-1' ? '提现失败' : (dataInfo.status == '0' ? '提现中' : dataInfo.status == '1'? '已到账' : '')}}</text>
 			</view>
 			<view class="child-item">
 				<text class="child-item-title">提现时间</text>
@@ -20,6 +24,19 @@
 				<text class="child-item-title">打款时间</text>
 				<text class="child-item-value">{{dataInfo.status_time}}</text>
 			</view>
+			
+			<view class="child-item" v-if="dataInfo.service_money">
+				<text class="child-item-title">服务费</text>
+				<text class="child-item-value">{{dataInfo.service_money}}</text>
+			</view>
+			<view class="child-item" >
+				<text class="child-item-title">实际到账</text>
+				<text class="child-item-value">{{dataInfo.extract_price -dataInfo.service_money }}</text>
+			</view>
+			<view class="child-item-x" >
+				<text class="child-item-title">失败原因</text>
+				<text class="child-item-value-x">{{dataInfo.fail_msg }}</text>
+			</view>
 		</view>
 		
 		<view class="bottom-info">
@@ -33,6 +50,8 @@
 				<text class="child-item-value">{{dealIdcard(dataInfo.bank_info.user_card)}}</text>
 			</view>
 		</view>
+		
+		<view class="bottom-phone">客服电话：400-600-8888</view>
 	
 	</view>
 </template>
@@ -46,6 +65,18 @@
 		}
 	})
 	
+	function dealType(type){
+		 let name
+		 if(type==1){
+			 name='佣金提现'
+		 }else  if(type==2){
+			 name='养老金提现'
+		 } if(type==3){
+			 name='红包提现'
+		 }
+		 return name
+	}
+	
 	function dealIdcard(idCard){
 		return idCard.charAt(0) + '*'.repeat(idCard.length - 2) +idCard.charAt(idCard.length - 1);
 	}
@@ -70,6 +101,7 @@ style:
 		min-height: 100VH;
 		background-color: #f8f8f8;
 		box-sizing: border-box;
+		padding-bottom: 40rpx;
 		
 		.bottom-info{
 			background-color: #fff;
@@ -80,32 +112,65 @@ style:
 			margin-top: 20rpx;
 		}
 		
+		.bottom-phone{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			color: #999;
+			padding-top: 20rpx;
+			padding-bottom: 20rpx;
+		}
+		
+		.child-item-x{
+			display: flex;
+			flex-direction: column;
+			width: 100%;
+			margin-bottom: 30rpx;	
+		}
+		
 		.child-item{
 			display: flex;
 			flex-direction: row;
 			align-items: center;
 			width: 100%;
             margin-bottom: 30rpx;	
-					
-			.child-item-title{
-				flex: 1;
-				font-size: 30rpx;
-				color: #333;
-			}
-			.child-item-value{
-				font-size: 30rpx;
-				color: #333;
-			}
-			.child-item-or-value{
-				font-size: 30rpx;
-				color: #f98f35;
-			}
 		}
-		.item-title{
+		.child-item-title{
+			flex: 1;
+			font-size: 30rpx;
+			color: #333;
+		}
+		.child-item-value{
+			font-size: 30rpx;
+			color: #333;
+		}
+		
+		.child-item-value-x{
 			font-size: 30rpx;
+			color: #666;
+			padding: 30rpx;
+			margin-top: 20rpx;
+			background-color: #f8f8f8;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			min-height: 200rpx;
+		}
+		.child-item-or-value{
+			font-size: 30rpx;
+			color: #f98f35;
+		}
+		.child-item-red-value{
+			font-size: 30rpx;
+			color: #ff0000;
+		}
+		.item-title{
+			font-size: 32rpx;
 			font-weight: bolder;
 			color: #333;
-			margin-bottom: 30rpx;
+			margin-bottom: 40rpx;
 			margin-top: 30rpx;
 		}
 		.top-info{
@@ -139,7 +204,7 @@ style:
 					margin-bottom: 40rpx;
 				}
 				.info-num{
-					font-size: 50rpx;
+					font-size: 54rpx;
 					font-weight: bolder;
 					color: #333;
 					margin-bottom: 80rpx;

src/subPages/pages/store/product/other.vue

@@ -6,6 +6,7 @@ import {
   getDyProductDetail,
   getJTTProductDetail,
   getJdProductDetail,
+  getJdLink,
   getPddProductDetail,
   getShareId,
   getSuProductDetail,
@@ -67,14 +68,18 @@ const state = reactive({
   data: {},
   shareId: '',
   pddData: {},
+  JDUrl:''
 })
 const isShow = ref(false)
 const detail = ref<IProductDetail>()
 const detailclone = ref<IProductDetail>()
 const isNeedAuth = ref(false)
+
 onLoad((options: any) => {
   const data: Partial<IProductDetail> = JSON.parse(decodeBase64(options.params))
   state.pddData = data
+  
+  console.log("===state.pddData",state.pddData);
   userStore.setRedirectPage(`/subPages/pages/store/product/other?params=${encodeBase64(data)}`, 'page')
   // if (options.platform && options.id) {
   uni.showLoading({
@@ -152,8 +157,13 @@ function loadProductDetail(product: Partial<IProductDetail>) {
 		  getJdProductDetail(product.id).then((res) => {
 		    console.log('京东商品详情', res)
 		    const { data, status } = res
-
-		    const jdProduct = data[0]
+			 const jdProduct = data[0]
+			 
+           getJdLink(product.id,jdProduct.discount_link).then(res=>{
+			   console.log("===res",res);
+			   state.JDUrl=res.data.url
+		   })
+		   
 		    // console.log(jdProduct)
 		    mergeProductDetailclone({
 		      images: jdProduct.detail,
@@ -337,6 +347,8 @@ function handleBuyNow() {
     })
 	return
   }
+  
+  console.log("===product.platform",detail.value.platform);
   if (detail.value?.platform) {
     // 京东
     if (detail.value?.platform == 6 && detail.value?.materialUrl) {
@@ -345,7 +357,6 @@ function handleBuyNow() {
       if (detail.value && detail.value.materialUrl) {
         uni.navigateToMiniProgram({
           appId: 'wx91d27dbf599dff74',
-          // path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
           path: `pages/union/proxy/proxy?spreadUrl=${detail.value.materialUrl}`,
           extraData: {
             foo: 'bar',
@@ -369,10 +380,8 @@ function handleBuyNow() {
     }
     else if (detail.value?.platform == 1) {
       console.log(detail.value)
-
 	  if (detail.value.pddlink.mobile_url.includes('mobile.yangkeduo')) {
 		  isNeedAuth.value = true
-
 		  console.log('需要授权')
 	  }
 
@@ -406,6 +415,12 @@ function handleBuyNow() {
     else {
            let platformName = ''
             let clipboardData = ''
+			
+			if (detail.value?.platform ==  6) {
+			  platformName = '京东'
+			  clipboardData = state.JDUrl
+			  console.log("===state.JDUrl",state.JDUrl);
+			}
             if (detail.value?.platform == 5) {
               platformName = '淘宝'
               clipboardData = detail.value?.spreadUrl

src/subPages/pages/withdrawal-record/index.vue

@@ -21,6 +21,17 @@ onLoad((option) => {
 	 	url:`/subPages/pages/record-detail/detail?itemInfo=${JSON.stringify(item)}`
 	 })
  }
+ function dealType(type:any){
+	 let name
+	 if(type==1){
+		 name='佣金'
+	 }else  if(type==2){
+		 name='养老金'
+	 } if(type==3){
+		 name='红包'
+	 }
+	 return name
+ }
  
 </script>
 <template>
@@ -33,14 +44,14 @@ onLoad((option) => {
 		<view class="item-content" @click="onItemClick(item)">
 			<div class="flex justify-between flex-1">
 			  <div>
-			    <div>{{item.title}}</div>
+			    <div>({{dealType(item.type)}}){{item.title}}</div>
 			    <div class="text-gray text-[11px] mt-20">{{ dayjs(item.create_time).format('YYYY-MM-DD HH:mm:ss') }}</div>
 			  </div>
 			  
 			  <div >
 			    <div>{{ item.extract_price }}</div>
-			    <div class="text-[11px] mt-20" :class="item.status == '0' ? 'or-color' : 'text-gray'"
-			    >{{ item.status == '-1' ? '已失败' : (item.status == '0' ? '提现中' : item.status == '1'? '已到账' : '')}}</div>
+			    <div class="text-[11px] mt-20" :class="item.status == '0'  ? 'or-color' :(item.status == '-1'?'text-red':'text-gray') "
+			    >{{ item.status == '-1' ? '提现失败' : (item.status == '0' ? '提现中' : item.status == '1'? '已到账' : '')}}</div>
 			  </div>
 			</div>
 			<image class="right-icon" :src="IMG_CDN_NEW_URL+'look_all_221013.png'" mode="widthFix"></image>
@@ -70,13 +81,16 @@ page {
 	align-items: center;
 }
 .right-icon{
-	width: 30rpx;
+	width: 20rpx;
 	margin-left: 20rpx;
 	height: 20rpx;
 }
 .mt-20{
 	margin-top: 20rpx;
 }
+.text-red{
+	color:#ff0000
+}
 </style>
 <route lang="yaml">
 style:

src/utils/http/http.ts

@@ -34,7 +34,6 @@ export class VRequest {
             isReturnNativeResponse, isTransformResponse,
         } = optionsTemp
 		
-		console.log("===apiUrl",apiUrl);
         // token header
         const token = getToken()
         if (token && withToken !== false) {
@@ -55,8 +54,7 @@ export class VRequest {
         if (apiUrl && isString(apiUrl)){
 			configTemp.url = `${apiUrl}${configTemp.url}`
 		}
-			console.log("===url", configTemp.url);
-            console.log("===data", configTemp.data);
+		console.log("===url", configTemp.url);
 			
         return new Promise((resolve, reject) => {
             uni.request({

src/utils/seat-data.js

@@ -0,0 +1,954 @@
+export const seatData = [{
+	"YCoord": "3",
+	"XCoord": "11",
+	"SeatCode": "4413141101#01#14",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "14",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "12",
+	"SeatCode": "4413141101#01#13",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "13",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "13",
+	"SeatCode": "4413141101#01#12",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "12",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "14",
+	"SeatCode": "4413141101#01#11",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "11",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "15",
+	"SeatCode": "4413141101#01#10",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "10",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "16",
+	"SeatCode": "4413141101#01#09",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "9",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "17",
+	"SeatCode": "4413141101#01#08",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "8",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "18",
+	"SeatCode": "4413141101#01#07",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "7",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "19",
+	"SeatCode": "4413141101#01#06",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "6",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "20",
+	"SeatCode": "4413141101#01#05",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "5",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "21",
+	"SeatCode": "4413141101#01#04",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "4",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "22",
+	"SeatCode": "4413141101#01#03",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "3",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "23",
+	"SeatCode": "4413141101#01#02",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "2",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "24",
+	"SeatCode": "4413141101#01#01",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "1",
+	"type":1
+}, {
+	"YCoord": "3",
+	"XCoord": "10",
+	"SeatCode": "4413141101#01#15",
+	"Status": 0,
+	"RowNum": "1",
+	"ColumnNum": "15",
+	"type":1
+}, {
+	"YCoord": "4",
+	"XCoord": "10",
+	"SeatCode": "4413141101#02#15",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "15"
+}, {
+	"YCoord": "4",
+	"XCoord": "11",
+	"SeatCode": "4413141101#02#14",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "4",
+	"XCoord": "12",
+	"SeatCode": "4413141101#02#13",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "4",
+	"XCoord": "13",
+	"SeatCode": "4413141101#02#12",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "4",
+	"XCoord": "14",
+	"SeatCode": "4413141101#02#11",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "4",
+	"XCoord": "15",
+	"SeatCode": "4413141101#02#10",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "4",
+	"XCoord": "16",
+	"SeatCode": "4413141101#02#09",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "4",
+	"XCoord": "17",
+	"SeatCode": "4413141101#02#08",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "4",
+	"XCoord": "18",
+	"SeatCode": "4413141101#02#07",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "4",
+	"XCoord": "19",
+	"SeatCode": "4413141101#02#06",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "4",
+	"XCoord": "20",
+	"SeatCode": "4413141101#02#05",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "4",
+	"XCoord": "21",
+	"SeatCode": "4413141101#02#04",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "4",
+	"XCoord": "22",
+	"SeatCode": "4413141101#02#03",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "4",
+	"XCoord": "23",
+	"SeatCode": "4413141101#02#02",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "4",
+	"XCoord": "24",
+	"SeatCode": "4413141101#02#01",
+	"Status": 0,
+	"RowNum": "2",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "5",
+	"XCoord": "10",
+	"SeatCode": "4413141101#03#15",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "15"
+}, {
+	"YCoord": "5",
+	"XCoord": "11",
+	"SeatCode": "4413141101#03#14",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "5",
+	"XCoord": "12",
+	"SeatCode": "4413141101#03#13",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "5",
+	"XCoord": "13",
+	"SeatCode": "4413141101#03#12",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "5",
+	"XCoord": "14",
+	"SeatCode": "4413141101#03#11",
+	"Status": 2,
+	"RowNum": "3",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "5",
+	"XCoord": "15",
+	"SeatCode": "4413141101#03#10",
+	"Status": 2,
+	"RowNum": "3",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "5",
+	"XCoord": "16",
+	"SeatCode": "4413141101#03#09",
+	"Status": 2,
+	"RowNum": "3",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "5",
+	"XCoord": "17",
+	"SeatCode": "4413141101#03#08",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "5",
+	"XCoord": "18",
+	"SeatCode": "4413141101#03#07",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "5",
+	"XCoord": "19",
+	"SeatCode": "4413141101#03#06",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "5",
+	"XCoord": "20",
+	"SeatCode": "4413141101#03#05",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "5",
+	"XCoord": "21",
+	"SeatCode": "4413141101#03#04",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "5",
+	"XCoord": "22",
+	"SeatCode": "4413141101#03#03",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "5",
+	"XCoord": "23",
+	"SeatCode": "4413141101#03#02",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "5",
+	"XCoord": "24",
+	"SeatCode": "4413141101#03#01",
+	"Status": 0,
+	"RowNum": "3",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "6",
+	"XCoord": "10",
+	"SeatCode": "4413141101#04#15",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "15"
+}, {
+	"YCoord": "6",
+	"XCoord": "11",
+	"SeatCode": "4413141101#04#14",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "6",
+	"XCoord": "12",
+	"SeatCode": "4413141101#04#13",
+	"Status": 2,
+	"RowNum": "4",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "6",
+	"XCoord": "13",
+	"SeatCode": "4413141101#04#12",
+	"Status": 2,
+	"RowNum": "4",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "6",
+	"XCoord": "14",
+	"SeatCode": "4413141101#04#11",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "6",
+	"XCoord": "15",
+	"SeatCode": "4413141101#04#10",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "6",
+	"XCoord": "16",
+	"SeatCode": "4413141101#04#09",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "6",
+	"XCoord": "17",
+	"SeatCode": "4413141101#04#08",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "6",
+	"XCoord": "18",
+	"SeatCode": "4413141101#04#07",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "6",
+	"XCoord": "19",
+	"SeatCode": "4413141101#04#06",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "6",
+	"XCoord": "20",
+	"SeatCode": "4413141101#04#05",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "6",
+	"XCoord": "21",
+	"SeatCode": "4413141101#04#04",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "6",
+	"XCoord": "22",
+	"SeatCode": "4413141101#04#03",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "6",
+	"XCoord": "23",
+	"SeatCode": "4413141101#04#02",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "6",
+	"XCoord": "24",
+	"SeatCode": "4413141101#04#01",
+	"Status": 0,
+	"RowNum": "4",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "9",
+	"XCoord": "10",
+	"SeatCode": "4413141101#05#14",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "9",
+	"XCoord": "11",
+	"SeatCode": "4413141101#05#13",
+	"Status": 2,
+	"RowNum": "5",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "9",
+	"XCoord": "12",
+	"SeatCode": "4413141101#05#12",
+	"Status": 2,
+	"RowNum": "5",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "9",
+	"XCoord": "13",
+	"SeatCode": "4413141101#05#11",
+	"Status": 2,
+	"RowNum": "5",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "9",
+	"XCoord": "14",
+	"SeatCode": "4413141101#05#10",
+	"Status": 2,
+	"RowNum": "5",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "9",
+	"XCoord": "15",
+	"SeatCode": "4413141101#05#09",
+	"Status": 2,
+	"RowNum": "5",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "9",
+	"XCoord": "16",
+	"SeatCode": "4413141101#05#08",
+	"Status": 2,
+	"RowNum": "5",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "9",
+	"XCoord": "17",
+	"SeatCode": "4413141101#05#07",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "9",
+	"XCoord": "18",
+	"SeatCode": "4413141101#05#06",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "9",
+	"XCoord": "19",
+	"SeatCode": "4413141101#05#05",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "9",
+	"XCoord": "20",
+	"SeatCode": "4413141101#05#04",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "9",
+	"XCoord": "21",
+	"SeatCode": "4413141101#05#03",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "9",
+	"XCoord": "22",
+	"SeatCode": "4413141101#05#02",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "9",
+	"XCoord": "23",
+	"SeatCode": "4413141101#05#01",
+	"Status": 0,
+	"RowNum": "5",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "10",
+	"XCoord": "10",
+	"SeatCode": "4413141101#06#14",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "10",
+	"XCoord": "11",
+	"SeatCode": "4413141101#06#13",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "10",
+	"XCoord": "12",
+	"SeatCode": "4413141101#06#12",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "10",
+	"XCoord": "13",
+	"SeatCode": "4413141101#06#11",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "10",
+	"XCoord": "14",
+	"SeatCode": "4413141101#06#10",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "10",
+	"XCoord": "15",
+	"SeatCode": "4413141101#06#09",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "10",
+	"XCoord": "16",
+	"SeatCode": "4413141101#06#08",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "10",
+	"XCoord": "17",
+	"SeatCode": "4413141101#06#07",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "10",
+	"XCoord": "18",
+	"SeatCode": "4413141101#06#06",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "10",
+	"XCoord": "19",
+	"SeatCode": "4413141101#06#05",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "10",
+	"XCoord": "20",
+	"SeatCode": "4413141101#06#04",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "10",
+	"XCoord": "21",
+	"SeatCode": "4413141101#06#03",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "10",
+	"XCoord": "22",
+	"SeatCode": "4413141101#06#02",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "10",
+	"XCoord": "23",
+	"SeatCode": "4413141101#06#01",
+	"Status": 0,
+	"RowNum": "6",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "11",
+	"XCoord": "10",
+	"SeatCode": "4413141101#07#14",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "11",
+	"XCoord": "11",
+	"SeatCode": "4413141101#07#13",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "11",
+	"XCoord": "12",
+	"SeatCode": "4413141101#07#12",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "11",
+	"XCoord": "13",
+	"SeatCode": "4413141101#07#11",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "11",
+	"XCoord": "14",
+	"SeatCode": "4413141101#07#10",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "11",
+	"XCoord": "15",
+	"SeatCode": "4413141101#07#09",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "11",
+	"XCoord": "16",
+	"SeatCode": "4413141101#07#08",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "11",
+	"XCoord": "17",
+	"SeatCode": "4413141101#07#07",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "11",
+	"XCoord": "18",
+	"SeatCode": "4413141101#07#06",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "11",
+	"XCoord": "19",
+	"SeatCode": "4413141101#07#05",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "11",
+	"XCoord": "20",
+	"SeatCode": "4413141101#07#04",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "11",
+	"XCoord": "21",
+	"SeatCode": "4413141101#07#03",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "11",
+	"XCoord": "22",
+	"SeatCode": "4413141101#07#02",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "11",
+	"XCoord": "23",
+	"SeatCode": "4413141101#07#01",
+	"Status": 0,
+	"RowNum": "7",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "12",
+	"XCoord": "10",
+	"SeatCode": "4413141101#08#14",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "12",
+	"XCoord": "11",
+	"SeatCode": "4413141101#08#13",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "12",
+	"XCoord": "12",
+	"SeatCode": "4413141101#08#12",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "12",
+	"XCoord": "13",
+	"SeatCode": "4413141101#08#11",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "12",
+	"XCoord": "14",
+	"SeatCode": "4413141101#08#10",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "12",
+	"XCoord": "15",
+	"SeatCode": "4413141101#08#09",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "12",
+	"XCoord": "16",
+	"SeatCode": "4413141101#08#08",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "12",
+	"XCoord": "17",
+	"SeatCode": "4413141101#08#07",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "12",
+	"XCoord": "18",
+	"SeatCode": "4413141101#08#06",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "12",
+	"XCoord": "19",
+	"SeatCode": "4413141101#08#05",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "12",
+	"XCoord": "20",
+	"SeatCode": "4413141101#08#04",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "12",
+	"XCoord": "21",
+	"SeatCode": "4413141101#08#03",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "12",
+	"XCoord": "22",
+	"SeatCode": "4413141101#08#02",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "12",
+	"XCoord": "23",
+	"SeatCode": "4413141101#08#01",
+	"Status": 0,
+	"RowNum": "8",
+	"ColumnNum": "1"
+}, {
+	"YCoord": "13",
+	"XCoord": "8",
+	"SeatCode": "4413141101#09#18",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "18"
+}, {
+	"YCoord": "13",
+	"XCoord": "9",
+	"SeatCode": "4413141101#09#17",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "17"
+}, {
+	"YCoord": "13",
+	"XCoord": "10",
+	"SeatCode": "4413141101#09#16",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "16"
+}, {
+	"YCoord": "13",
+	"XCoord": "11",
+	"SeatCode": "4413141101#09#15",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "15"
+}, {
+	"YCoord": "13",
+	"XCoord": "12",
+	"SeatCode": "4413141101#09#14",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "14"
+}, {
+	"YCoord": "13",
+	"XCoord": "13",
+	"SeatCode": "4413141101#09#13",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "13"
+}, {
+	"YCoord": "13",
+	"XCoord": "14",
+	"SeatCode": "4413141101#09#12",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "12"
+}, {
+	"YCoord": "13",
+	"XCoord": "15",
+	"SeatCode": "4413141101#09#11",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "11"
+}, {
+	"YCoord": "13",
+	"XCoord": "16",
+	"SeatCode": "4413141101#09#10",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "10"
+}, {
+	"YCoord": "13",
+	"XCoord": "17",
+	"SeatCode": "4413141101#09#09",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "9"
+}, {
+	"YCoord": "13",
+	"XCoord": "18",
+	"SeatCode": "4413141101#09#08",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "8"
+}, {
+	"YCoord": "13",
+	"XCoord": "19",
+	"SeatCode": "4413141101#09#07",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "7"
+}, {
+	"YCoord": "13",
+	"XCoord": "20",
+	"SeatCode": "4413141101#09#06",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "6"
+}, {
+	"YCoord": "13",
+	"XCoord": "21",
+	"SeatCode": "4413141101#09#05",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "5"
+}, {
+	"YCoord": "13",
+	"XCoord": "22",
+	"SeatCode": "4413141101#09#04",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "4"
+}, {
+	"YCoord": "13",
+	"XCoord": "23",
+	"SeatCode": "4413141101#09#03",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "3"
+}, {
+	"YCoord": "13",
+	"XCoord": "24",
+	"SeatCode": "4413141101#09#02",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "2"
+}, {
+	"YCoord": "13",
+	"XCoord": "25",
+	"SeatCode": "4413141101#09#01",
+	"Status": 0,
+	"RowNum": "9",
+	"ColumnNum": "1"
+}]

src/utils/util.ts

@@ -87,3 +87,32 @@ export function formatDate(date, type, unit) {
 	}
 }
 
+
+ export function getRelativeDay(timestamp:any) {
+	  const today = new Date();
+	  today.setHours(0, 0, 0, 0); // 当前日期的零点
+	  const targetDate = new Date(timestamp);
+	  targetDate.setHours(0, 0, 0, 0); // 目标日期的零点
+	
+	  const diffDays = Math.round((targetDate - today) / (1000 * 3600 * 24));
+	  
+	  if (diffDays === 0) return '今天';
+	  if (diffDays === 1) return '明天';
+	  if (diffDays === 2) return '后天';
+	  return '';
+	}
+	
+	
+export	function getWeekday(timestamp:any) {
+	  const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+	  const date = new Date(timestamp); // 注意：若时间戳为秒级需乘以1000
+	  return weekdays[date.getDay()];
+	}
+	
+   export function formatTimestamp(timestamp:any) {
+	  let _timestamp = timestamp*1000  
+	  const weekday = getWeekday(_timestamp);
+	  const relativeDay = getRelativeDay(_timestamp);
+	  return relativeDay ? relativeDay : weekday;
+	}
+

uni-pages.d.ts

@@ -104,6 +104,16 @@ interface NavigateToOptions {
        "/subPages/pages/mine-top/qianbao" |
        "/subPages/pages/mine-top/repurchase" |
        "/subPages/pages/mine-top/vr" |
+       "/subPages/pages/movies/chooseSeat - 副本" |
+       "/subPages/pages/movies/chooseSeat" |
+       "/subPages/pages/movies/chooseSeat1" |
+       "/subPages/pages/movies/cityList" |
+       "/subPages/pages/movies/moviesIndex" |
+       "/subPages/pages/movies/moviesOrder" |
+       "/subPages/pages/movies/moviesTicketList" |
+       "/subPages/pages/movies/nearbyCinemas" |
+       "/subPages/pages/movies/orderDetail" |
+       "/subPages/pages/movies/orderList" |
        "/subPages/pages/my-profile/index" |
        "/subPages/pages/order/comment" |
        "/subPages/pages/order/detail" |
@@ -166,7 +176,7 @@ interface NavigateToOptions {
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {
-  url: "/pages/home/index" | "/pages/store/nearby/index" | "/pages/dacang/list/index" | "/pages/user/index"
+  url: "/pages/home/index" | "/pages/dacang/list/index" | "/pages/user/index"
 }
 
 type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;