初始化项目

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/fanghua_user_uniapp.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/fanghua_user_uniapp.iml" filepath="$PROJECT_DIR$/.idea/fanghua_user_uniapp.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

common/request.js

@@ -2,8 +2,8 @@
 export default class Request {
 	http(router, data = {}, method,contentType) {
 		let that = this;
-		// let path = 'http://localhost:7014';
-		let path = 'https://api.yjf.runtzh.com'; 
+		// let path = 'http://111.230.193.88:7014';
+		let path = 'https://api.zxfh.cdwjyyh.com'; 
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
 		// 	title: '加载中'

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx45cf09091aead547",
+        "appid" : "wx19c8813ffc33d1cb",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -81,7 +81,7 @@
     },
     "vueVersion" : "2",
     "h5" : {
-        "title" : "御君方",
+        "title" : "芳华佳选",
         "devServer" : {
             "https" : false
         },

package-lock.json

@@ -1,42 +1,63 @@
 {
     "name": "shop",
     "version": "1.0.0",
-    "lockfileVersion": 1,
+    "lockfileVersion": 3,
     "requires": true,
-    "dependencies": {
-        "animate.css": {
+    "packages": {
+        "": {
+            "name": "shop",
+            "version": "1.0.0",
+            "license": "ISC",
+            "dependencies": {
+                "animate.css": "^3.7.2",
+                "cos-wx-sdk-v5": "^1.0.10",
+                "dayjs": "^1.11.7",
+                "tim-wx-sdk": "^2.17.0"
+            }
+        },
+        "node_modules/animate.css": {
             "version": "3.7.2",
             "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-3.7.2.tgz",
             "integrity": "sha512-0bE8zYo7C0KvgOYrSVfrzkbYk6IOTVPNqkiHg2cbyF4Pq/PXzilz4BRWA3hwEUBoMp5VBgrC29lQIZyhRWdBTw=="
         },
-        "cos-wx-sdk-v5": {
+        "node_modules/cos-wx-sdk-v5": {
             "version": "1.1.5",
             "resolved": "https://registry.npmmirror.com/cos-wx-sdk-v5/-/cos-wx-sdk-v5-1.1.5.tgz",
             "integrity": "sha512-++O7HD6Hz6UDlhgKMchJOap85bQtY+DKzPg2r5uCdyRb45AWC+Xj9qetXohPpA2G/inNVSqxw/EtjGPe2OIhyg==",
-            "requires": {
+            "dependencies": {
                 "mime": "^2.4.6",
                 "xmldom": "^0.1.31"
             }
         },
-        "dayjs": {
+        "node_modules/dayjs": {
             "version": "1.11.7",
             "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz",
             "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
         },
-        "mime": {
+        "node_modules/mime": {
             "version": "2.6.0",
             "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
-            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
+            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
         },
-        "tim-wx-sdk": {
+        "node_modules/tim-wx-sdk": {
             "version": "2.18.0",
             "resolved": "https://registry.npmmirror.com/tim-wx-sdk/-/tim-wx-sdk-2.18.0.tgz",
             "integrity": "sha512-Dz6aHpaCdk1ST/ZzltliSFHBsB5CdFU+q2NpFZc9PV8br0a5F2GyYgrdLn1Yqt8YntEwMReaud3LUY638zNJug=="
         },
-        "xmldom": {
+        "node_modules/xmldom": {
             "version": "0.1.31",
             "resolved": "https://registry.npmmirror.com/xmldom/-/xmldom-0.1.31.tgz",
-            "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
+            "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
+            "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+            "engines": {
+                "node": ">=0.1"
+            }
         }
     }
 }

package.json

@@ -1,12 +1,18 @@
 {
     "name": "shop",
     "version": "1.0.0",
-    "description": "",
+    "description": "客户管理系统小程序端",
     "keywords": [],
     "dependencies": {
         "animate.css": "^3.7.2",
         "cos-wx-sdk-v5": "^1.0.10",
         "dayjs": "^1.11.7",
         "tim-wx-sdk": "^2.17.0"
-    }
+    },
+    "main": "main.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "",
+    "license": "ISC"
 }

pages.json

@@ -24,7 +24,7 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "御君方",
+				"navigationBarTitleText": "芳华佳选",
                 "enablePullDownRefresh": false,
                 "navigationStyle": "custom",
 				"app-plus": {
@@ -930,7 +930,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "御君方",
+		"navigationBarTitleText": "芳华佳选",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},
@@ -949,11 +949,17 @@
 				"selectedIconPath": "/static/images/home_sel.png",
 				"text": "首页"
 			},
+			// {
+			// 	"pagePath": "pages/home/companyInfo",
+			// 	"iconPath": "/static/images/health.png",
+			// 	"selectedIconPath": "/static/images/health_sel.png",
+			// 	"text": "企业理念"
+			// },
 			{
-				"pagePath": "pages/home/companyInfo",
-				"iconPath": "/static/images/health.png",
-				"selectedIconPath": "/static/images/health_sel.png",
-				"text": "企业理念"
+				"pagePath": "pages/shopping/cart",
+				"iconPath": "/static/images/cart.png",
+				"selectedIconPath": "/static/images/cart_sel.png",
+				"text": "购物车"
 			},
 			// {
 			// 	"pagePath": "pages/doctor/index",

pages/auth/login.vue

@@ -7,7 +7,7 @@
         	<view class="logo-img">
         		<image  src="../../static/logo.png"></image>
         	</view>
-        	<view class="title">御君方</view>
+        	<view class="title">芳华佳选</view>
         </view>
         <view class="login-notice">为了提供更优质的服务，请先登录</view>
 		<!-- <button
@@ -109,8 +109,8 @@ export default {
 		getWxCode() {
 			//在微信公众号请求用户网页授权之前，开发者需要先到公众平台官网中的“开发 - 接口权限 - 网页服务 - 网页帐号 - 网页授权获取用户基本信息”的配置选项中，修改授权回调域名。请注意，这里填写的是域名（是一个字符串），而不是URL，因此请勿加 http:// 等协议头； 
 			//http://shequ.natapp1.cc/#/pages/index/index?deviceId=8
-			var appId="wx40593595e62f61ad";
-			var url="http://h5.yjf.runtzh.com";
+			var appId="wx19c8813ffc33d1cb";
+			var url="http://192.168.10.122:7014";
 			window.location.href ='https://open.weixin.qq.com/connect/oauth2/authorize?appid='+appId+'&redirect_uri=' +encodeURIComponent(url+"/#/pages/auth/wxLogin") +'&response_type=code&scope=snsapi_userinfo&state=JeffreySu-954&connect_redirect=1#wechat_redirect';
 			//console.log('https://open.weixin.qq.com/connect/oauth2/authorize?appid='+appId+'&redirect_uri=' +encodeURIComponent("http://shequ.natapp1.cc/#/pages/index/index?deviceId="+this.deviceId) +'&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect')
 			// redirect_uri是授权成功后，跳转的url地址，微信会帮我们跳转到该链接，并且通过？的形式拼接code

pages/common/launch.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="loadding" v-if="loadding==true">
 			<image src="/static/images/logo.jpg"></image>
-			<text class="text">御君方</text>
+			<text class="text">芳华佳选</text>
 		</view>
 	</view>
 </template>

pages/home/index.vue

@@ -9,7 +9,7 @@
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="top-title">
 						<image class="name" src="../../static/images/name.png"></image>
-						<!-- <view class="name">御君方</view> -->
+						<!-- <view class="name">芳华佳选</view> -->
 						<!-- <view class="dot">•</view><view class="sub-name">七彩互联网医院</view> -->
 					</view>
 					<!-- 搜索框、购物车、客服 -->
@@ -500,9 +500,9 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '零利润药房',
+				title: '芳华佳选',
 				path: `/pages/common/launch`,
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250310/aeb776c6aa174d7c94181e5fd212e0f1.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 		},
 		onReachBottom() {
@@ -512,9 +512,9 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title: '御君方-七彩互联网医院',
+				title: '芳华佳选互联网医院',
 				query:'',//页面参数
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250310/aeb776c6aa174d7c94181e5fd212e0f1.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 		},
 		computed: {
@@ -522,7 +522,7 @@
 			// 计算属性的 getter
 			bg: function() {
 				var top=this.top/30;
-				console.log(top)
+				// console.log(top)
 				return 'rgba(43,199,185, ' + top + ')';
 			},
 		},
@@ -545,7 +545,7 @@
 			navToMiniProgram(){
 				uni.navigateToMiniProgram({
 					// appid  写你要跳转的小程序的 appid
-					appId: 'wxc3f0a952b7bc2b94',
+					appId: 'wx19c8813ffc33d1cb',
 					// 路径写  src下的路径,假如你跳转的是pages下的页面,就可以写pages/index
 					path: '/pages/common/launch',
 					extraData: {

pages/shopping/cart.vue

@@ -395,7 +395,7 @@
 			justify-content: space-between;
 			position: fixed;
 			left: 0;
-			bottom: 0;
+			bottom: 0rpx;
 			z-index: 99;
 			.left{
 				display: flex;

pages/shopping/paymentOrder.vue

@@ -147,7 +147,7 @@
 	import {getUserInfo} from '@/api/user'
 
 	import {getStoreConfig} from '@/api/common'
-	import {editPayType,pay,getStoreOrderById} from '@/api/storeOrder'
+	import {editPayType,pay,getStoreOrderById,getMyStoreOrderById} from '@/api/storeOrder'
 	export default {
 		data() {
 			return {
@@ -159,6 +159,9 @@
 				payLimitTime:null,
 				order:null,
 				user:null,
+				checkTimer: null, // 轮询定时器 ID
+				maxRetryCount: 10, // 最大轮询次数（可选）
+				retryCount: 0      // 当前轮询次数（可选）
 			}
 		},
 		onLoad(option) {
@@ -171,13 +174,17 @@
 				//小程序的原生菜单中显示分享按钮，才能够让发送给朋友与分享到朋友圈两个按钮可以点击
 				menus:["shareAppMessage"] //不设置默认发送给朋友
 			})
+			if (this.checkTimer) {
+			    clearInterval(this.checkTimer);
+			    this.checkTimer = null;
+			  }
 		},
 		//发送给朋友
 		onShareAppMessage(res) {
 			return {
 				title: "帮TA支付",
 				path: '/pages_user/user/otherPaymentOrder?orderId='+this.orderId,
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250310/aeb776c6aa174d7c94181e5fd212e0f1.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 
 		},
@@ -283,8 +290,11 @@
 
 			},
 			otherPayOrder(){
+			var that=this;
+			console.log(that.order.id)
+			var sum=that.order.id
 				uni.navigateTo({
-					url: '/pages_user/user/otherPaymentOrder?orderId='+this.orderId
+					url: '/pages_user/user/storeOrderDetail?id='+sum
 				})
 			},
 			payOrder(){
@@ -293,9 +303,9 @@
 				uni.showLoading();
 				pay(data).then(
 					res => {
-						if(res.code==200){
-							 console.log(res);
-							 if(res.payType==1||res.payType==2){
+					if(res.code==200){
+						 console.log(res);
+						 if(res.payType==1||res.payType==2){
                  var result = res.result;
                  wx.navigateToMiniProgram({
                    appId: 'wx1b63de1096c46cde', // 收银台小程序 AppId 固定值
@@ -311,12 +321,38 @@
                    envVersion: 'release', // 开发版 develop，体验版 trial,正式环境传 release
                    success(res) {
                      uni.showLoading({
-                       title:"查询支付结果中..."
+                       title:"查询支付结果中...",
+					   
                      })
-                     console.log(res)
+					 // 启动定时器并保存 ID
+					   that.checkTimer = setInterval(() => {
+						 const data = { orderId: that.order.id };
+						 getMyStoreOrderById(data).then(res => {
+						   if (res.code == 200) {
+							 if (res.order.status == 3) {
+							   // 跳转前清除定时器
+							   clearInterval(that.checkTimer);
+							   uni.navigateTo({
+								 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
+							   });
+							 }else{
+								 clearInterval(that.checkTimer);
+								 
+								 uni.navigateTo({
+								 	 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
+								 });
+							 }
+						   }
+						 });
+					   }, 4000);
+					 // setTimeout(()=>{
+						//  that.otherPayOrder()
+					 // },4000)
+                     console.log('结果结果',res)
 // 接口调用成功的回调函数
                    },
                    fail(res) {
+					   if (that.checkTimer) clearInterval(that.checkTimer);
 // 接口调用失败的回调函数
                    }
                  })

pages/shopping/productDetails.vue

@@ -104,9 +104,10 @@
 				</view> -->
 			</view>
 			<view class="btn-box">
-				<view class="btn cart" >好药分享
+				<!-- <view class="btn cart" >好药分享
 				<button  class="share" data-name="shareBtn" open-type="share"></button>
-				</view>
+				</view> -->
+				<view class="btn cart" @click="addCart('cart')">加入购物车</view>
 				<view class="btn buy" @click="addCart('buy')">{{buyText}}</view>
 			</view>
 		</view>
@@ -203,6 +204,7 @@
 				specVisible: false,
 				// 规格数量
 				specNum: 1,
+				 show: false
 			};
 		},
 		onLoad(options) {
@@ -460,19 +462,26 @@
 			},
 			// 数量加法
 			addNum() {
-				if(this.specNum<10){
-					this.specNum++
-				}
-				else{
+				// if(this.specNum<10){
+				// }
+				// else{
+				// 	uni.showToast({
+				// 		icon:'none',
+				// 		title: '限购10盒',
+				// 	});
+				// }
+				if(this.product.stock==0){
+					this.specVisible = false//弹窗显示
 					uni.showToast({
 						icon:'none',
-						title: '限购10盒',
+						title: '库存不足',
 					});
+				}else{
+					this.specNum++
 				}
 				if(this.specNum>=this.productValueSelect.stock){
 					this.specNum=this.productValueSelect.stock
 				}
-				
 			},
 			// 确定选择该规格
 			submit() {

pages/user/index.vue

@@ -149,12 +149,14 @@
 						</view>
 					</view>
 					<!-- 退出登录按钮 -->
-					<!-- <view class="log-out">退出登录</view> -->
 				</view>
-				<view class="banner">
+				<view style="padding-bottom: 20rpx;">
+					<view @tap="loginOUt" class="log-out x-c" >退出登录</view>
+				</view>
+				<!-- <view class="banner">
 					<image src="https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20221125/71ddd95044bb46d5b27e19a5f61cf5ab.png"></image>
 					<view class="tel_btn" @click="callService()"></view>
-				</view>
+				</view> -->
 				<view class="like-product">
 					<likeProduct  ref="product" />
 				</view>
@@ -211,6 +213,10 @@
 			this.$refs.product.getGoodsProducts();
 		},
 		methods: {
+			loginOUt(){
+				this.utils.loginOut();
+				this.getUserInfo();
+			},
 			openPersonInfo(){
 				this.utils.isLogin().then(res => {
 					uni.navigateTo({
@@ -510,18 +516,7 @@
 				}
 			}
 		}
-		.log-out{
-			height: 80upx;
-			line-height: 80upx;
-			text-align: center;
-			font-size: 26upx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #666666;
-			background: #FFFFFF;
-			border-radius: 16upx;
-			margin-top: 20upx;
-		}
+		
 	}
 	.sub-btn{
 		position: absolute;
@@ -552,4 +547,17 @@
 			opacity:0.0;
 		}
 	}
+	.log-out{
+		height: 80upx;
+		margin: 20upx;
+		line-height: 80upx;
+		text-align: center;
+		font-size: 26upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #666666;
+		background: #FFFFFF;
+		border-radius: 16upx;
+		margin-top: 20upx;
+	}
 </style>

pages_company/order/confirmCompanyOrder.vue

@@ -83,18 +83,18 @@
 		//发送给朋友
 		onShareAppMessage(res) {
 			return {
-				title: "御君方-您的专属健康解决方案",
+				title: "芳华佳选-您的专属健康解决方案",
 				path: '/pages_company/order/confirmOrder?orderKey='+this.orderKey,
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250310/aeb776c6aa174d7c94181e5fd212e0f1.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 			
 		},
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title:"御君方-您的专属健康解决方案",
+				title:"芳华佳选-您的专属健康解决方案",
 				query:'orderKey='+this.orderKey,
-				imageUrl:  'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl:  'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250310/aeb776c6aa174d7c94181e5fd212e0f1.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 		},
 		methods: {

pages_user/user/otherPaymentOrder.vue

@@ -63,11 +63,18 @@
 				payLimitTime:null,
 				order:null,
 				user:null,
+				checkTimer: null, // 轮询定时器 ID
+				maxRetryCount: 10, // 最大轮询次数（可选）
+				retryCount: 0      // 当前轮询次数（可选）
 			}
 		},
 		onLoad(option) {
 			this.orderId=JSON.parse(option.orderId);
 			this.getStoreOrderById();
+			if (this.checkTimer) {
+			    clearInterval(this.checkTimer);
+			    this.checkTimer = null;
+			  }
 		},
 		methods: {
 			copyOrderSn(text) {
@@ -120,29 +127,76 @@
 				otherPayment(data).then(
 					res => {
 						if(res.code==200){
+							console.log('json;;;;;',res.result)
 							var result=JSON.parse(res.result);
-							uni.requestPayment({
-								provider: 'wxpay',
-								timeStamp: result.timeStamp,
-								nonceStr: result.nonceStr,
-								package: result.package,
-								signType: result.signType,
-								paySign: result.paySign,
-								success: function(res) {
-										uni.hideLoading();
-										uni.redirectTo({
-											url:"otherPaySuccess"
-										})
-								},
-								fail: function(err) {
-									uni.showToast({
-										icon:'none',
-										title:'fail:' + JSON.stringify(err),
-									});
-									console.log('fail:' + JSON.stringify(err));
-									uni.hideLoading();
-								}
-							});
+							wx.navigateToMiniProgram({
+								   appId: 'wx1b63de1096c46cde', // 收银台小程序 AppId 固定值
+								   path: '/pages/pay/pay', // 收银台小程序 固定路径
+								   extraData: {
+								     orderNo: result.orderNo,
+								     orderAmt: result.orderAmt,
+								     platMerCstNo: result.platMerCstNo,
+								     platMerCstName: result.platMerCstName,
+								     businessCstNo: result.businessCstNo,
+								     licenseCode: result.licenseCode,
+								   },
+								   envVersion: 'release', // 开发版 develop，体验版 trial,正式环境传 release
+								   success(res) {
+									 uni.showLoading({
+									   title:"查询支付结果中..."
+									 })
+									// 启动定时器并保存 ID
+									  that.checkTimer = setInterval(() => {
+										 const data = { orderId: that.order.id };
+										 getMyStoreOrderById(data).then(res => {
+										   if (res.code == 200) {
+											 if (res.order.status == 3) {
+											   // 跳转前清除定时器
+											   clearInterval(that.checkTimer);
+											   uni.navigateTo({
+												 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
+											   });
+											 }else{
+												 clearInterval(that.checkTimer);
+												 
+												 uni.navigateTo({
+													 url: '/pages_user/user/storeOrderDetail?id=' + that.order.id
+												 });
+											 }
+										   }
+										 });
+									  }, 4000);
+									 console.log(res)
+									// 接口调用成功的回调函数
+								   },
+								   fail(res) {
+									// 接口调用失败的回调函数
+									console.log(res)
+									if (that.checkTimer) clearInterval(that.checkTimer);
+								   }
+								 })
+							// uni.requestPayment({
+							// 	provider: 'wxpay',
+							// 	timeStamp: result.timeStamp,
+							// 	nonceStr: result.nonceStr,
+							// 	package: result.package,
+							// 	signType: result.signType,
+							// 	paySign: result.paySign,
+							// 	success: function(res) {
+							// 			uni.hideLoading();
+							// 			uni.redirectTo({
+							// 				url:"otherPaySuccess"
+							// 			})
+							// 	},
+							// 	fail: function(err) {
+							// 		uni.showToast({
+							// 			icon:'none',
+							// 			title:'fail:' + JSON.stringify(err),
+							// 		});
+							// 		console.log('fail:' + JSON.stringify(err));
+							// 		uni.hideLoading();
+							// 	}
+							// });
 							// uni.requestPayment({
 							// 	provider: 'wxpay',
 							// 	timeStamp: res.result.timeStamp,

pages_user/user/pay.vue

@@ -4,7 +4,7 @@
 			<view class="inner">
 				<view class="pay">
 					<view class="title">
-						<text class="name">付款给 御君方</text>
+						<text class="name">付款给 芳华佳选</text>
 						<text class="desc">微信收款</text>
 					</view>
 					<view class="pay-money">
@@ -56,7 +56,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '御君方-收款',
+				title: '芳华佳选-收款',
 				path: `/pages_user/user/pay?companyId=`+this.companyId+"&companyUserId="+this.companyUserId
 			}
 		},
@@ -116,6 +116,11 @@
                   uni.showLoading({
                     title:"查询支付结果中..."
                   })
+				  setTimeout(()=>{
+					 uni.navigateTo({
+					 	url: 'pages_user/user/storeOrder'
+					 })
+				  },4000)
                   console.log(res)
 // 接口调用成功的回调函数
                 },

pages_user/user/paymentOrderRemain.vue

@@ -92,7 +92,7 @@
 			return {
 				title: "帮TA支付",
 				path: '/pages_user/user/otherPaymentOrderRemain?orderId='+this.orderId,
-				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230106/6b459adfb1004c1a96219bcdf07e337c.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: 'https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250310/aeb776c6aa174d7c94181e5fd212e0f1.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 			
 		},

pages_user/user/storeOrder.vue

@@ -184,7 +184,7 @@
 						//设置列表数据
 						if (page.num == 1) {
 							that.dataList = res.data.list; 
-							
+							// console.log(res)
 						} else {
 							that.dataList = that.dataList.concat(res.data.list);
 							 

pages_user/user/userTuiAdd.vue

@@ -1,12 +1,12 @@
 <template>
   <view>
 		<view class="form-box">
-			<view class="title">你为什么想成为御君方健康推广?</view>
+			<view class="title">你为什么想成为芳华佳选健康推广?</view>
 			<view class="textarea-box">
 				<textarea v-model="question1" value="" placeholder="请输入..." maxlength="200" placeholder-class="textarea-place" />
 				<view class="num-box">{{ question1.length }}/200</view>
 			</view>
-			<view class="title">你是否了解御君方健康推广大使?</view>
+			<view class="title">你是否了解芳华佳选健康推广大使?</view>
 			<view class="textarea-box">
 				<textarea v-model="question2" value="" placeholder="请输入..." maxlength="200" placeholder-class="textarea-place" />
 				<view class="num-box">{{ question1.length }}/200</view>