shish 4 سال پیش
والد
کامیت
ba6145e9a0
21فایلهای تغییر یافته به همراه46 افزوده شده و 42 حذف شده
  1. 0 0
      ghsApp/dist/build/mp-weixin/admin/changePrice/list.js
  2. 0 0
      ghsApp/dist/build/mp-weixin/admin/changePrice/list.wxml
  3. 0 0
      ghsApp/dist/build/mp-weixin/admin/changePrice/list.wxss
  4. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json
  5. 2 2
      ghsApp/dist/build/mp-weixin/components/app-date-picker.json
  6. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-avatar.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-search.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  21. 12 8
      ghsApp/src/admin/changePrice/list.vue

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/changePrice/list.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/changePrice/list.wxml


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
ghsApp/dist/build/mp-weixin/admin/changePrice/list.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-date-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-avatar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-footer-cart.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-search.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-table.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-td.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-tr.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 12 - 8
ghsApp/src/admin/changePrice/list.vue

@@ -96,18 +96,22 @@ export default {
 				if(res.code == 1){
 					uni.hideLoading()
 					let file = res.data.file
+					let shortFile = res.data.shortFile
 					uni.downloadFile({
 						url: file,
-						//header: {'content-type': 'application/vnd.ms-excel'},
-						success: (res) => {
+						header: {"Content-Type": 'application/vnd.ms-excel'},
+						filePath: `${wx.env.USER_DATA_PATH}/${shortFile}`,
+  						success: (res) => {
 							if (res.statusCode === 200) {
-								console.log('res.tempFilePath',res)
-								uni.saveImageToPhotosAlbum({
-									filePath: res.tempFilePath,
-									success: function (data) {
-										uni.showToast({title:'下载成功,文件请加后缀 .xls 再使用',icon:'none',mask:true,duration: 5000})
+								wx.saveFileToDisk({
+									filePath: res.filePath,
+									success: function(res) {
+										console.log(res)
+									},
+									fail:function(res) {
+										console.log(res)
 									}
-								});
+								})
 							}
 						},
 						fail:()=>{

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است