1

pages/index/genRes/index.vue

@@ -44,7 +44,8 @@
 		</view>
 
 
-		<u-modal :show="showLead" title="PDF下载提示" confirmText="去预览" content="" @confirm="prePdf">
+		<u-modal showCancelButton @cancel="showLead=false" :show="showLead" title="PDF下载提示" confirmText="去预览" content=""
+			@confirm="prePdf">
 			<view class="slot-content">
 				<view class="txt1">
 					下载PDF,请先点击预览页面右上角...菜单按钮,如图1:
@@ -203,6 +204,7 @@
 					console.log('pdf地址：', res1.data.url);
 					this.download(res1.data.url, 1)
 				} else {
+					uni.hideLoading()
 					this.$toast(res1.message)
 				}
 			},
@@ -244,6 +246,7 @@
 						}
 					},
 					fail: (e) => {
+						uni.hideLoading()
 						console.log(e, '文件下载失败')
 						uni.showToast({
 							title: '文件下载失败',

pages/my/huiBen_record/index.scss

@@ -88,4 +88,24 @@
 		}
 	}
 		}
+	}
+	
+	
+	
+	
+	::v-deep .u-popup__content{
+		border-radius: 30rpx!important;
+	}
+	
+	.slot-content{
+		
+		// font-size: 28rpx;
+		.txt1{
+			margin-bottom: 10rpx;
+		}
+		.caidan{
+			width: 100%;
+			height: 30rpx;
+			margin-top: 10rpx;
+		}
 	}

pages/my/huiBen_record/index.vue

@@ -33,7 +33,8 @@
 			</view>
 		</view>
 
-		<u-modal :show="showLead" title="PDF下载提示" confirmText="去预览" content="" @confirm="prePdf">
+		<u-modal showCancelButton @cancel="showLead=false" :show="showLead" title="PDF下载提示" confirmText="去预览" content=""
+			@confirm="prePdf">
 			<view class="slot-content">
 				<view class="txt1">
 					下载PDF,请先点击预览页面右上角...菜单按钮,如图1:
@@ -91,6 +92,9 @@
 				})
 			},
 			async downPdf(id, item) {
+				uni.showLoading({
+					title: '生成中'
+				});
 				this.huibenItem = item
 				console.log('downPdf-------------');
 				let res1 = await genPdf({
@@ -105,6 +109,7 @@
 
 					this.download(res1.data.url, 1)
 				} else {
+					uni.hideLoading()
 					this.$toast(res1.message)
 				}
 			},
@@ -116,9 +121,7 @@
 			},
 			download(file, type) {
 				let _this = this
-				uni.showLoading({
-					title: '生成中'
-				});
+
 				//下载文件
 				uni.downloadFile({ //只能是GET请求
 					url: file, //请求地址(后台返回的码流地址)
@@ -164,6 +167,7 @@
 						}
 					},
 					fail: (e) => {
+						uni.hideLoading()
 						console.log(e, '文件下载失败')
 						uni.showToast({
 							title: '文件下载失败',

unpackage/dist/dev/mp-weixin/pages/index/genRes/index.js

@@ -131,6 +131,11 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  if (!_vm._isMounted) {
+    _vm.e0 = function ($event) {
+      _vm.showLead = false
+    }
+  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -234,6 +239,7 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
 // import content from "../../../utils/pinyin.js"
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
@@ -375,6 +381,7 @@ var _default = {
                   console.log('pdf地址：', res1.data.url);
                   _this3.download(res1.data.url, 1);
                 } else {
+                  uni.hideLoading();
                   _this3.$toast(res1.message);
                 }
               case 9:
@@ -422,6 +429,7 @@ var _default = {
           }
         },
         fail: function fail(e) {
+          uni.hideLoading();
           console.log(e, '文件下载失败');
           uni.showToast({
             title: '文件下载失败',

unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.js

@@ -129,6 +129,11 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 = _vm.cusumerList.length
+  if (!_vm._isMounted) {
+    _vm.e0 = function ($event) {
+      _vm.showLead = false
+    }
+  }
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -228,6 +233,7 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -272,23 +278,27 @@ var _default = {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                uni.showLoading({
+                  title: '生成中'
+                });
                 _this2.huibenItem = item;
                 console.log('downPdf-------------');
-                _context.next = 4;
+                _context.next = 5;
                 return (0, _index.genPdf)({
                   // id:this.taskId
                   id: id
                 });
-              case 4:
+              case 5:
                 res1 = _context.sent;
                 console.log('获取pdfurl返回值--------2', res1);
                 if (res1.code == 0) {
                   console.log('pdf地址：', res1.data.url);
                   _this2.download(res1.data.url, 1);
                 } else {
+                  uni.hideLoading();
                   _this2.$toast(res1.message);
                 }
-              case 7:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -305,9 +315,7 @@ var _default = {
     download: function download(file, type) {
       var _this3 = this;
       var _this = this;
-      uni.showLoading({
-        title: '生成中'
-      });
+
       //下载文件
       uni.downloadFile({
         //只能是GET请求
@@ -353,6 +361,7 @@ var _default = {
         },
 
         fail: function fail(e) {
+          uni.hideLoading();
           console.log(e, '文件下载失败');
           uni.showToast({
             title: '文件下载失败',

unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.wxss

@@ -76,4 +76,15 @@ view.data-v-0d73b78c {
   border-radius: 54rpx;
   border: none;
 }
+.data-v-0d73b78c .u-popup__content {
+  border-radius: 30rpx !important;
+}
+.slot-content .txt1.data-v-0d73b78c {
+  margin-bottom: 10rpx;
+}
+.slot-content .caidan.data-v-0d73b78c {
+  width: 100%;
+  height: 30rpx;
+  margin-top: 10rpx;
+}
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,10 +10,16 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "ignoreUploadUnusedFiles": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.1.5",
   "appid": "wxa7481605ea99a9a0",
   "projectname": "huiben",
   "condition": {
@@ -32,5 +39,9 @@
       "current": -1,
       "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }