修改看课页面

App.vue

@@ -3,6 +3,10 @@
 	// import TIM from 'tim-wx-sdk';
 	// import COS from 'cos-wx-sdk-v5';
 	export default {
+		globalData: {
+			appId: 'wx19c8813ffc33d1cb',
+			wsUrl: 'wss://websocket.cdwjyyh.com',
+		},
 		onLaunch: function() {
 			// uni.$TUIKit = TIM.create({
 			// 	SDKAppID: 1400693126
@@ -123,11 +127,13 @@
 	    
 	}
 </style>
-<style>
+<style lang="scss">
+	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+	@import "@/uni_modules/uview-ui/index.scss";
 	/*每个页面公共css */
 	/* 解决小程序和app滚动条的问题 */
 	/* #ifdef MP-WEIXIN || APP-PLUS */
-		/deep/ ::-webkit-scrollbar {
+		::v-deep ::-webkit-scrollbar {
 		    display: none !important;
 		    width: 0 !important;
 		    height: 0 !important;

api/storeOrder.js

@@ -77,6 +77,10 @@ let request = new Request().http
  export function getExpresslist(data) {
  	 return request('/app/storeOrder/getExpressMulti',data,'POST','application/json;charset=UTF-8');
  }
+ //用户取消支付
+ export function userCancelPay(data) {
+ 	 return request('/app/storeOrder/cancelPay',data,'POST','application/json;charset=UTF-8');
+ } 
  
  
  

common/request.js

@@ -1,15 +1,29 @@
 // uni-app请求封装
+import store from "@/store/index.js";
 export default class Request {
-	http(router, data = {}, method,contentType) {
+	http(router, data = {}, method,contentType,url) {
 		let that = this;
 		// let path =  'http://192.168.10.122:7014';
 		let path = 'https://api.zxfh.cdwjyyh.com'; 
 		uni.setStorageSync('requestPath',path)
+		let token="";
+		let type = 0
+		if(url!=null){
+			path= url;
+			type = 1
+			uni.setStorageSync('requestImagesPath',url)
+			token= uni.getStorageSync('AppTokenmini_RTCourse')
+		}
+		else{
+			type = 0
+			uni.setStorageSync('requestPath',path)
+			token= uni.getStorageSync('AppToken');
+		}
 		// uni.showLoading({
 		// 	title: '加载中'
 		// });
 		return new Promise((resolve, reject) => {
-			let token = uni.getStorageSync('AppToken');
+			// let token = uni.getStorageSync('AppToken');
 			var httpContentType='application/x-www-form-urlencoded';
 			if(contentType!=undefined){
 				//application/json;charset=UTF-8
@@ -29,6 +43,11 @@ export default class Request {
 				success: (res) => {
 					//收到开发者服务器成功返回的回调函数
 					if(res.data.code==401){//没有权限直接退出到登录界面
+						if(type == 1) {
+							store.commit('setCoureLogin', 2);
+							resolve({ code: 401, data: null });
+							return
+						}
 						let pages = getCurrentPages();
 						pages.forEach(function(element) {
 						  if(element!=undefined&&element.route=="pages/auth/login"){
@@ -36,12 +55,6 @@ export default class Request {
 						  	return;
 						  }
 						});
-						// let url = pages[ pages.length - 1]; //当前页页面实例
-						// //如果登录界面已打开,自动关闭
-						// if(url!=undefined&&url.route=="pages/auth/login"){
-						//  	resolve(res.data)
-						// 	return;
-						// }
 						uni.navigateTo({
 							url:'/pages/auth/login',
 							success: () => {
@@ -54,7 +67,7 @@ export default class Request {
 						})
 						return;
 					}
-					if (res.data.token) {
+					if (res.data.token&&type==0) {
 						uni.setStorageSync('AppToken',res.data.token)
 					}
 					resolve(res.data)

main.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import App from './App'
-
+import store from './store'
+import uView from '@/uni_modules/uview-ui'
  
 Vue.config.productionTip = false
   
@@ -13,6 +14,7 @@ Vue.prototype.setData = setData;
  
 App.mpType = 'app'
 const app = new Vue({
+	store,
     ...App
 })
 app.$mount()

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "互联网医院",
-    "appid" : "__UNI__D138114",
+    "name" : "芳华佳轩",
+    "appid" : "__UNI__7931688",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

package-lock.json

@@ -12,9 +12,182 @@
                 "animate.css": "^3.7.2",
                 "cos-wx-sdk-v5": "^1.0.10",
                 "dayjs": "^1.11.7",
-                "tim-wx-sdk": "^2.17.0"
+                "tim-wx-sdk": "^2.17.0",
+                "vuex": "^4.1.0"
             }
         },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.27.1",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+            "license": "MIT",
+            "peer": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+            "license": "MIT",
+            "peer": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.28.5.tgz",
+            "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@babel/types": "^7.28.5"
+            },
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.28.5.tgz",
+            "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.28.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.5.5",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/@vue/compiler-core": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz",
+            "integrity": "sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@babel/parser": "^7.28.4",
+                "@vue/shared": "3.5.22",
+                "entities": "^4.5.0",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.1"
+            }
+        },
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz",
+            "integrity": "sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-core": "3.5.22",
+                "@vue/shared": "3.5.22"
+            }
+        },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.22.tgz",
+            "integrity": "sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@babel/parser": "^7.28.4",
+                "@vue/compiler-core": "3.5.22",
+                "@vue/compiler-dom": "3.5.22",
+                "@vue/compiler-ssr": "3.5.22",
+                "@vue/shared": "3.5.22",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.19",
+                "postcss": "^8.5.6",
+                "source-map-js": "^1.2.1"
+            }
+        },
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz",
+            "integrity": "sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.5.22",
+                "@vue/shared": "3.5.22"
+            }
+        },
+        "node_modules/@vue/devtools-api": {
+            "version": "6.6.4",
+            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+            "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+            "license": "MIT"
+        },
+        "node_modules/@vue/reactivity": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.22.tgz",
+            "integrity": "sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/shared": "3.5.22"
+            }
+        },
+        "node_modules/@vue/runtime-core": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.22.tgz",
+            "integrity": "sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.5.22",
+                "@vue/shared": "3.5.22"
+            }
+        },
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz",
+            "integrity": "sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.5.22",
+                "@vue/runtime-core": "3.5.22",
+                "@vue/shared": "3.5.22",
+                "csstype": "^3.1.3"
+            }
+        },
+        "node_modules/@vue/server-renderer": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.22.tgz",
+            "integrity": "sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-ssr": "3.5.22",
+                "@vue/shared": "3.5.22"
+            },
+            "peerDependencies": {
+                "vue": "3.5.22"
+            }
+        },
+        "node_modules/@vue/shared": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
+            "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
+            "license": "MIT",
+            "peer": true
+        },
         "node_modules/animate.css": {
             "version": "3.7.2",
             "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-3.7.2.tgz",
@@ -29,11 +202,48 @@
                 "xmldom": "^0.1.31"
             }
         },
+        "node_modules/csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+            "license": "MIT",
+            "peer": true
+        },
         "node_modules/dayjs": {
             "version": "1.11.7",
             "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz",
             "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
         },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "license": "BSD-2-Clause",
+            "peer": true,
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.21",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.5"
+            }
+        },
         "node_modules/mime": {
             "version": "2.6.0",
             "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
@@ -45,11 +255,110 @@
                 "node": ">=4.0.0"
             }
         },
+        "node_modules/nanoid": {
+            "version": "3.3.11",
+            "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
+            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "peer": true,
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+            "license": "ISC",
+            "peer": true
+        },
+        "node_modules/postcss": {
+            "version": "8.5.6",
+            "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.6.tgz",
+            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "nanoid": "^3.3.11",
+                "picocolors": "^1.1.1",
+                "source-map-js": "^1.2.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "license": "BSD-3-Clause",
+            "peer": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "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=="
         },
+        "node_modules/vue": {
+            "version": "3.5.22",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.22.tgz",
+            "integrity": "sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.5.22",
+                "@vue/compiler-sfc": "3.5.22",
+                "@vue/runtime-dom": "3.5.22",
+                "@vue/server-renderer": "3.5.22",
+                "@vue/shared": "3.5.22"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vuex": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.1.0.tgz",
+            "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/devtools-api": "^6.0.0-beta.11"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
         "node_modules/xmldom": {
             "version": "0.1.31",
             "resolved": "https://registry.npmmirror.com/xmldom/-/xmldom-0.1.31.tgz",

package.json

@@ -7,7 +7,8 @@
         "animate.css": "^3.7.2",
         "cos-wx-sdk-v5": "^1.0.10",
         "dayjs": "^1.11.7",
-        "tim-wx-sdk": "^2.17.0"
+        "tim-wx-sdk": "^2.17.0",
+        "vuex": "^4.1.0"
     },
     "main": "main.js",
     "scripts": {

pages.json

@@ -927,6 +927,113 @@
 				 
 			]
 		}
+		,{
+			"root": "pages_course",
+			"pages": [
+				{
+					"path" : "videoDetail",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "课程",
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"usingComponenets": {
+							"uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+						},
+						"componentPlaceholder": {
+							"uni-popup": "view"
+						},
+						"app-plus": {
+							"bounce": "none",
+							"softinputMode": "adjustResize"
+						}
+					}
+					
+				},{
+					"path" : "video",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+					
+				},{
+					"path" : "feedback",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "投诉反馈",
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none",
+							"softinputMode": "adjustResize"
+						}
+					}
+					
+				},{
+					"path" : "webview",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "授权登录",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none",
+							"softinputMode": "adjustResize"
+						}
+					}
+					
+				},{
+					"path" : "learn",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+					
+				},{
+					"path" : "teacherClassroom",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "健康大讲堂",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+					
+				},{
+					"path" : "course",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+					
+				},{
+					"path" : "register",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
+						"scrollIndicator": "none",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+					
+				}
+			]
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/auth/login.vue

@@ -325,7 +325,10 @@ export default {
 			}
 		},
 		back() {
-			uni.navigateBack()
+			// uni.navigateBack()
+			uni.switchTab({
+				url:'/pages/home/index'
+			})
 		}
 	}
 }

pages/common/launch.vue

@@ -43,10 +43,7 @@
 			
 		},
 		onLoad() {
-			
 			this.getDicts()
-			
-			
 		}
 	};
  

pages/home/companyInfo.vue

@@ -12,7 +12,6 @@
 			controls
 			></video> 
 		</view>
-		
 	</view>
 </template>
 

pages/home/index.vue

@@ -80,7 +80,8 @@
 					<image src="https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250320/f2d3ba32a9344dc79b4df7c228189243.png" mode=""></image>
 				</view> -->
 			</view>
-			<view class="item"  @click="navTo('/pages_user/user/userShareList')">
+			<!-- <view class="item"  @click="navTo('/pages_user/user/userShareList')"> -->
+			<view class="item"  @click="navTo('/pages_shopping/shopping/productSalesList')">
 				<!-- <image class="bg-img" src="../../static/images/banner2.png" mode=""></image> -->
 				<image class="bg-img" src="https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20250320/0a47b5c6b5fb43eab0b4426d5db27471.png" mode=""></image>
 				<!-- <view class="inner">
@@ -800,7 +801,7 @@
 			goAuthUrl(url){
 				this.utils.isLogin().then(res => {
 					if(res){
-						uni.navigateTo({
+						uni.switchTab({
 							url:url
 						})
 					}
@@ -1023,13 +1024,6 @@
 						height:100%;
 					}
 				}
-				// .name{
-				// 	font-size: 42upx;
-				// 	font-family: Source Han Sans CN;
-				// 	font-weight: bold;
-				// 	color: #FFFFFF;
-				// 	padding-left: 41upx;
-				// }
 				.dot{
 					margin: 0upx 10upx;
 					font-size: 28upx;
@@ -1069,7 +1063,7 @@
 						flex: 1;
 					}
 				}
-				/deep/.uni-badge{
+				::v-deep.uni-badge{
 					border: none;
 					background-color: #FF3636;
 					font-family: Roboto;
@@ -1977,7 +1971,7 @@
 				align-items: center;
 				position: relative;
 				image{
-					width::100%;
+					width:100%;
 				}
 			}
 		}

pages/shopping/cart.vue

@@ -303,7 +303,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+							background: linear-gradient(90deg, #2BC7B9 0%, #77cbf3 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;

pages/shopping/confirmOrder.vue

@@ -480,7 +480,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+							background: linear-gradient(90deg, #2BC7B9 0%, #77cbf3 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;

pages/shopping/confirmPackageOrder.vue

@@ -270,10 +270,10 @@
 				if (this.isSubmitting) return; // 防止重复点击
 				 this.isSubmitting = true; // 禁用按钮
 				 if(this.isSubmitting){
-				 	uni.showToast({
-				 		icon:'none',
-				 		title: '不能重复点击',
-				 	});
+				 	// uni.showToast({
+				 	// 	icon:'none',
+				 	// 	title: '不能重复点击',
+				 	// });
 				 }
 				uni.requestSubscribeMessage({
 					tmplIds: this.temps,
@@ -435,7 +435,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+							background: linear-gradient(90deg, #2BC7B9 0%, #77cbf3 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;

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,userCancelPay} from '@/api/storeOrder'
 export default {
   data() {
     return {
@@ -287,6 +287,17 @@ export default {
         url: '/pages_user/user/otherPaymentOrder?orderId='+this.orderId
       })
     },
+	getcanle(){
+		var that=this;
+		var data = {orderId:this.order.id,payType:this.order.payType};
+		userCancelPay(data).then(res=>{
+			if(res.code==200){
+				console.log(res)
+			}else{
+				
+			}
+		})
+	},
     payOrder(){
       var data = {orderId:this.order.id,payType:this.order.payType};
       var that=this;
@@ -315,6 +326,7 @@ export default {
                       icon:'none',
                       title:'fail:' + JSON.stringify(err),
                     });
+					that.getcanle()
                     // console.log('fail:' + JSON.stringify(err));
                     uni.hideLoading();
                   }

pages/shopping/productDetails.vue

@@ -32,7 +32,7 @@
 					<text class="label">零售价</text>
 					<text class="old" >¥{{product.otPrice}}</text>
 				</view>
-				<view class="share-box">
+				<view class="share-box" v-if="token||token!=null">
 					<text class="text">分享</text>
 					<image src="../../static/images/share1.png" mode=""></image>
 					<button  class="share" data-name="shareBtn" open-type="share">分享</button>
@@ -203,6 +203,7 @@
 				cartCount: 0,
 				// 规格弹窗
 				specVisible: false,
+				token:null,
 				// 规格数量
 				specNum: 1,
 				 show: false,
@@ -233,6 +234,8 @@
 			}
 		},
 		onShow() {
+			this.token=uni.getStorageSync('AppToken')?uni.getStorageSync('AppToken'):null
+			console.log(this.token)
 			this.getProductDetails();
 		},
 		//发送给朋友
@@ -811,12 +814,12 @@
 					text-align: center;
 				}
 			}
-			/deep/.uni-badge--x{
+			::v-deep.uni-badge--x{
 				display: flex;
 				align-items: center;
 				justify-content: center;
 			}
-			/deep/.uni-badge{
+			::v-deep.uni-badge{
 				border: none;
 				background-color: #FF3636;
 				font-family: Roboto;

pages/user/index.vue

@@ -10,7 +10,7 @@
 							<image :src="user.avatar==null?'/static/images/detault_head.jpg':user.avatar" mode="aspectFill"></image>
 						</view>
 						<view class="name-phone">
-							<view class="name">{{user.nickname}}</view>
+							<view class="name">{{user.nickname?user.nickname:'请登录'}}</view>
 							<view class="phone" v-if="user.phone!=''">{{utils.parsePhone(user.phone)}}</view>
 						</view>
 					</view>
@@ -32,7 +32,7 @@
 					
 				</view>
 				<!-- 我的订单 -->
-				<view class="my-order">
+				<view class="my-order" v-if="apptoken!=null">
 					<view class="inner">
 						<view class="title-box">
 							<text class="title">我的订单</text>
@@ -103,10 +103,10 @@
 								<image src="../../static/images/address.png" mode=""></image>
 								<text class="text">收货地址</text>
 							</view>
-							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/integral')">
+							<!-- <view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/integral')">
 								<image src="../../static/images/integral.png" mode=""></image>
 								<text class="text">积分管理</text>
-							</view>
+							</view> -->
 							<view class="item no-marin-bottom"  @click="navgetTo('/pages_shopping/shopping/myCoupon')">
 								<image src="../../static/images/mycoupon.png" mode=""></image>
 								<text class="text">优惠券</text>
@@ -150,7 +150,7 @@
 					</view>
 					<!-- 退出登录按钮 -->
 				</view>
-				<view style="padding-bottom: 20rpx;">
+				<view style="padding-bottom: 20rpx;" v-if="apptoken!=null">
 					<view @tap="loginOUt" class="log-out x-c" >退出登录</view>
 				</view>
 				<view class="banner">
@@ -192,7 +192,7 @@
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
 				// 消息数量
 				msgNum: 0,
-			 
+			 apptoken:null
 				 
 			};
 		},
@@ -202,10 +202,15 @@
 		onShow() {
 			console.log("onshow")
 			var that=this;
-			this.utils.isLogin().then(res => {
+			// this.utils.isLogin().then(res => {
+			// 	that.getUserInfo();
+			// 	that.getOrderCount();
+			// })
+			this.apptoken = uni.getStorageSync('AppToken')
+			if(uni.getStorageSync('AppToken')){
 				that.getUserInfo();
 				that.getOrderCount();
-			})
+			}
 			
 		},
 		onReachBottom() {
@@ -215,15 +220,27 @@
 		methods: {
 			loginOUt(){
 				this.utils.loginOut();
-				this.getUserInfo();
+				uni.switchTab({
+					url:'/pages/home/index'
+				})
+				this.user={}
+				this.user.phone=""
+				// this.getUserInfo();
 			},
 			openPersonInfo(){
-				this.utils.isLogin().then(res => {
-					uni.navigateTo({
-						url:"/pages_user/user/personInfo"
-					})
-				})
-				 
+				console.log('123')
+				// this.utils.isLogin().then(res => {
+					
+				// })
+				 if(uni.getStorageSync('AppToken')){
+					 uni.navigateTo({
+					 	url:"/pages_user/user/personInfo"
+					 })
+				 }else{
+					 uni.navigateTo({
+					 	url:"/pages/auth/login"
+					 })
+				 }
 			},
 			callService(){
 				 uni.makePhoneCall({

pages_company/index.vue

@@ -24,10 +24,10 @@
 						<image src="../static/images/icon_coupon.png" mode=""></image>
 						<text class="text">制单优惠券</text>
 					</view> -->
-					<view class="item" @click="toPay()">
+					<!-- <view class="item" @click="toPay()">
 						<image src="../static/images/money.png" mode=""></image>
 						<text class="text">微信收款</text>
-					</view>
+					</view> -->
 					<!-- <view class="item" @click="alipay()">
 						<image src="../static/images/money.png" mode=""></image>
 						<text class="text">支付宝收款</text>

pages_company/order/productDetails.vue

@@ -724,12 +724,12 @@
 					text-align: center;
 				}
 			}
-			/deep/.uni-badge--x{
+			::v-deep.uni-badge--x{
 				display: flex;
 				align-items: center;
 				justify-content: center;
 			}
-			/deep/.uni-badge{
+			::v-deep.uni-badge{
 				border: none;
 				background-color: #FF3636;
 				font-family: Roboto;

pages_company/storeOrderDetail.vue

@@ -220,9 +220,9 @@
 				支付分享
 				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 			</view>
-			<view class="btn share-btn" v-if="order.status==0" @click="openEditMoney()">
+			<!-- <view class="btn share-btn" v-if="order.status==0" @click="openEditMoney()">
 				修改定金
-			</view>
+			</view> -->
 		</view>
 	 
 		<view class="popup-box" v-if="editShow">

pages_company/storeProductPackageDetails.vue

@@ -238,10 +238,10 @@
 				if (this.isSubmitting) return; // 防止重复点击
 				 this.isSubmitting = true; // 禁用按钮
 				 if(this.isSubmitting){
-				 	uni.showToast({
-				 		icon:'none',
-				 		title: '不能重复点击',
-				 	});
+				 	// uni.showToast({
+				 	// 	icon:'none',
+				 	// 	title: '不能重复点击',
+				 	// });
 				 }
 				this.utils.isLogin().then(res => {
 					if(res){
@@ -581,12 +581,12 @@
 					text-align: center;
 				}
 			}
-			/deep/.uni-badge--x{
+			::v-deep.uni-badge--x{
 				display: flex;
 				align-items: center;
 				justify-content: center;
 			}
-			/deep/.uni-badge{
+			::v-deep.uni-badge{
 				border: none;
 				background-color: #FF3636;
 				font-family: Roboto;

pages_user/user/otherPaymentOrder.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-	import {otherPayment,getStoreOrderById,getMyStoreOrderById} from '@/api/storeOrder'
+	import {otherPayment,getStoreOrderById,getMyStoreOrderById,userCancelPay} from '@/api/storeOrder'
 	import {checkpayment} from '@/api/payment'
 	export default {
 		data() {
@@ -79,6 +79,17 @@
 			  }
 		},
 		methods: {
+			getcanle(){
+				var that=this;
+				var data = {orderId:this.order.id,payType:this.order.payType};
+				userCancelPay(data).then(res=>{
+					if(res.code==200){
+						console.log(res)
+					}else{
+						
+					}
+				})
+			},
 			copyOrderSn(text) {
 				// 复制方法
 				uni.setClipboardData({
@@ -251,7 +262,8 @@
 										icon:'none',
 										title:'fail:' + JSON.stringify(err),
 									});
-									console.log('fail:' + JSON.stringify(err));
+									that.getcanle()
+									// console.log('fail:' + JSON.stringify(err));
 									uni.hideLoading();
 								}
 							});

uni.scss

@@ -11,7 +11,7 @@
  *
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
-
+@import '@/uni_modules/uview-ui/theme.scss';
 /* 颜色变量 */
 
 /* 行为相关颜色 */

utils/common.js

@@ -1,4 +1,5 @@
 import {checkLogin} from '@/api/user'
+import store from "@/store/index.js";
 import dayjs from 'dayjs'
 var isEmpty =function(obj) {
 	if (typeof obj == "undefined" || obj == null || obj == "") {
@@ -33,6 +34,19 @@ var isLogin=  function() {
 	 
 }
 
+var  isLoginCourse =  function() {
+	return new Promise((resolve, reject) => {
+		let token = uni.getStorageSync('AppTokenmini_RTCourse');
+		if (token==null||token==undefined||token=="" ) {
+			store.commit('setCoureLogin', 0);
+			resolve(false);
+		} else {
+			store.commit('setCoureLogin', 1);
+			resolve(true);
+		}
+	}); 
+}
+
 var loginOut= function() {
 	  uni.setStorageSync('AppToken',null);
 	  uni.setStorageSync('userInfo',null);
@@ -362,7 +376,21 @@ var formatDate=function(dateStr) {
 	}
 	return formatDate;
 }
-
+ /**
+  * 随机字符串
+  * 
+  */
+ var generateRandomString=function(length){
+  let result = '';
+  const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  const charactersLength = characters.length;
+  
+  for (let i = 0; i < length; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
+}
+ 
 module.exports = {
 		formatDate:formatDate,
         isEmpty : isEmpty,
@@ -385,7 +413,7 @@ module.exports = {
 		parseTime:parseTime,
 		setData:setData,
 		urlToObj:urlToObj,
-		checkCompanyUserLoginState:checkCompanyUserLoginState
-		
-		
+		checkCompanyUserLoginState:checkCompanyUserLoginState,
+		isLoginCourse: isLoginCourse,
+		generateRandomString:generateRandomString
 };