liujiaxin před 12 hodinami
rodič
revize
0a5dd9682e
5 změnil soubory, kde provedl 71 přidání a 22 odebrání
  1. 3 0
      App.vue
  2. 4 1
      common/request.js
  3. 47 7
      package-lock.json
  4. 4 1
      package.json
  5. 13 13
      pages_shopping/live/refundOrderDetail.vue

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3 - 0
App.vue


+ 4 - 1
common/request.js

@@ -3,7 +3,10 @@ import store from '@/store/index.js'
 export default class Request {
 	http(router, data = {}, method, contentType, url) {
 		let that = this;
-		let path = 'https://api.fhhx.runtzh.com';
+		// let path = 'https://api.fhhx.runtzh.com';
+		
+		var path =uni.getStorageSync('requestPath')
+		console.log("目前path",path)
 		// let path = 'http://p9ce6b6a.natappfree.cc';// 余红奇本地
 		// let path = 'http://x5d7cc68.natappfree.cc';//刘明欣
 		// let path =  'http://192.168.10.122:7014';

+ 47 - 7
package-lock.json

@@ -13,10 +13,13 @@
                 "cos-wx-sdk-v5": "^1.0.10",
                 "crypto": "^1.0.1",
                 "crypto-js": "^4.2.0",
-                "dayjs": "^1.11.19",
+                "date-fns": "^4.1.0",
+                "dayjs": "^1.11.20",
                 "hls": "0.0.1",
                 "tim-wx-sdk": "^2.17.0",
+                "uview-ui": "^2.0.38",
                 "vuex": "^4.1.0",
+                "weixin-js-sdk": "^1.6.5",
                 "ws": "^8.19.0"
             }
         },
@@ -208,10 +211,19 @@
             "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
             "peer": true
         },
+        "node_modules/date-fns": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/kossnocorp"
+            }
+        },
         "node_modules/dayjs": {
-            "version": "1.11.19",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-            "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
+            "version": "1.11.20",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
+            "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ=="
         },
         "node_modules/entities": {
             "version": "7.0.1",
@@ -322,6 +334,14 @@
             "resolved": "https://registry.npmjs.org/tim-wx-sdk/-/tim-wx-sdk-2.18.0.tgz",
             "integrity": "sha512-Dz6aHpaCdk1ST/ZzltliSFHBsB5CdFU+q2NpFZc9PV8br0a5F2GyYgrdLn1Yqt8YntEwMReaud3LUY638zNJug=="
         },
+        "node_modules/uview-ui": {
+            "version": "2.0.38",
+            "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.38.tgz",
+            "integrity": "sha512-6egHDf9lXHKpG3hEjRE0vMx4+VWwKk/ReTf5x18KrIKqdvdPRqO3+B8Unh7vYYwrIxzAWIlmhZ9RJpKI/4UqPQ==",
+            "engines": {
+                "HBuilderX": "^3.1.0"
+            }
+        },
         "node_modules/vue": {
             "version": "3.5.30",
             "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.30.tgz",
@@ -354,6 +374,11 @@
                 "vue": "^3.2.0"
             }
         },
+        "node_modules/weixin-js-sdk": {
+            "version": "1.6.5",
+            "resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz",
+            "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ=="
+        },
         "node_modules/ws": {
             "version": "8.19.0",
             "resolved": "https://registry.npmmirror.com/ws/-/ws-8.19.0.tgz",
@@ -554,10 +579,15 @@
             "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
             "peer": true
         },
+        "date-fns": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg=="
+        },
         "dayjs": {
-            "version": "1.11.19",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
-            "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
+            "version": "1.11.20",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
+            "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ=="
         },
         "entities": {
             "version": "7.0.1",
@@ -624,6 +654,11 @@
             "resolved": "https://registry.npmjs.org/tim-wx-sdk/-/tim-wx-sdk-2.18.0.tgz",
             "integrity": "sha512-Dz6aHpaCdk1ST/ZzltliSFHBsB5CdFU+q2NpFZc9PV8br0a5F2GyYgrdLn1Yqt8YntEwMReaud3LUY638zNJug=="
         },
+        "uview-ui": {
+            "version": "2.0.38",
+            "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.38.tgz",
+            "integrity": "sha512-6egHDf9lXHKpG3hEjRE0vMx4+VWwKk/ReTf5x18KrIKqdvdPRqO3+B8Unh7vYYwrIxzAWIlmhZ9RJpKI/4UqPQ=="
+        },
         "vue": {
             "version": "3.5.30",
             "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.30.tgz",
@@ -645,6 +680,11 @@
                 "@vue/devtools-api": "^6.0.0-beta.11"
             }
         },
+        "weixin-js-sdk": {
+            "version": "1.6.5",
+            "resolved": "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz",
+            "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ=="
+        },
         "ws": {
             "version": "8.19.0",
             "resolved": "https://registry.npmmirror.com/ws/-/ws-8.19.0.tgz",

+ 4 - 1
package.json

@@ -8,10 +8,13 @@
         "cos-wx-sdk-v5": "^1.0.10",
         "crypto": "^1.0.1",
         "crypto-js": "^4.2.0",
-        "dayjs": "^1.11.19",
+        "date-fns": "^4.1.0",
+        "dayjs": "^1.11.20",
         "hls": "0.0.1",
         "tim-wx-sdk": "^2.17.0",
+        "uview-ui": "^2.0.38",
         "vuex": "^4.1.0",
+        "weixin-js-sdk": "^1.6.5",
         "ws": "^8.19.0"
     },
     "main": "main.js",

+ 13 - 13
pages_shopping/live/refundOrderDetail.vue

@@ -179,12 +179,12 @@
 						</view>
 					</view>
 				</view>
-<!-- 按钮 -->
-		<view class="btn-box">
-			<button class="btn cancel contact-btn" open-type="contact">
-				<text>售后客服</text>
-			</button>
-		</view>
+				<!-- 按钮 -->
+				<view class="btn-box">
+					<button class="btn cancel contact-btn" open-type="contact">
+						<text>售后客服</text>
+					</button>
+				</view>
 			</view>
 		</view>
 
@@ -192,8 +192,7 @@
 </template>
 
 <script>
-
-import {
+	import {
 		getDicts
 	} from '@/api/index.js'
 	import {
@@ -242,7 +241,7 @@ import {
 				return this.sales.createTime;
 			},
 		},
-		methods: { 
+		methods: {
 			getDicts: function() {
 				getDicts().then(
 					res => {
@@ -253,8 +252,8 @@ import {
 					rej => {}
 				);
 			},
-			
-			
+
+
 			// 日期格式化方法
 			formatDate(date) {
 				const year = date.getFullYear();
@@ -723,7 +722,7 @@ import {
 				color: #FFFFFF;
 			}
 
-				&.contact-btn{
+			&.contact-btn {
 				background: transparent;
 				border: 1px solid #DDDDDD;
 				color: #666666;
@@ -732,7 +731,8 @@ import {
 				text-align: center;
 				line-height: 64upx;
 			}
-			&.contact-btn::after{
+
+			&.contact-btn::after {
 				display: none;
 			}
 		}

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů