修改

App.vue

@@ -6,65 +6,11 @@
 		},
 		onShow: function() {
 			const that = this;
-			that.search();
 		},
 		onHide: function() {
 			console.log('App Hide')
 		},
 		methods: {
-			search() {
-				const that = this;
-				uni.getStorage({
-					key: 'openid',
-					success: function(res) {
-						that.searchOpenid(res.data)
-					},
-					fail: function(err) {
-						uni.login({
-							success: async function(res) {
-								if (res.code) {
-									const aee = await that.$app('/wechat/api/login/app', 'GET', {
-										js_code: res.code,
-										config: that.$config.wx_projectkey
-									})
-									if (aee.errcode == '0') {
-										uni.setStorage({
-											key: "openid",
-											data: aee.data.openid
-										})
-										that.searchOpenid(aee.data.openid)
-									} else {
-										uni.showToast({
-											title: aee.errmsg,
-											icon: 'none'
-										})
-									}
-								} else {
-									uni.showToast({
-										title: res.errMsg,
-										icon: 'none'
-									})
-								}
-							}
-						});
-					}
-				})
-			},
-			async searchOpenid(openid) {
-				const that = this;
-				const aee = await that.$api(`/login/wxapp/${openid}`, 'POST', {})
-				if (aee.errcode == '0') {
-					uni.setStorage({
-						key: "token",
-						data: aee.data
-					})
-				} else {
-					uni.showToast({
-						title: aee.errmsg,
-						icon: 'none'
-					})
-				}
-			},
 			// 强制更新
 			forceUpdate() {
 				const that = this;

pages.json

@@ -87,7 +87,8 @@
 				{
 					"path": "group/index",
 					"style": {
-						"navigationBarTitleText": "群组信息"
+						"navigationBarTitleText": "群组信息",
+						"enablePullDownRefresh": true
 					}
 				},
 				{

pages/home/index.vue

@@ -29,8 +29,12 @@
 						</view>
 						<view class="list" v-for="(item, index) in friendList" :key="index"
 							@tap="toInfo(item,'friend')">
-							<uni-list-chat :title="item.patientName"
-								:avatar="item.patientIcon[0].url||config.user_url[0].url" :note="item.content"
+							<uni-list-chat v-if="item.notRead==0" :title="item.patientName"
+								:avatar="item.patientIcon||config.user_url[0].url" :note="item.content"
+								:time="item.time" link="navigateTo" @click="toInfo(item,'friend')">
+							</uni-list-chat>
+							<uni-list-chat v-else :title="item.patientName"
+								:avatar="item.patientIcon||config.user_url[0].url" :note="item.content"
 								:time="item.time" badge-positon="left" :badge-text="item.notRead" link="navigateTo"
 								@click="toInfo(item,'friend')">
 							</uni-list-chat>
@@ -128,9 +132,11 @@
 					...that.searchfriend
 				})
 				if (res.errcode == '0') {
+					// 处理显示数据
 					for (let val of res.data) {
 						if (val.type == 'image') val.content = '[图片]'
 						if (val.type == 'record') val.content = '[语音]'
+						if (val.patientIcon.length > 0) val.patientIcon = val.patientIcon[0].url
 						val.time = that.formatDate(val.time)
 					}
 					that.$set(that, `friendList`, res.data)

pages/index/index.vue

@@ -16,7 +16,7 @@
 		onShow: async function() {
 			const that = this;
 			await that.searchConfig();
-			await that.searchToken();
+			await that.search();
 		},
 		methods: {
 			// 查询基本设置
@@ -31,17 +31,61 @@
 					})
 				}
 			},
-			// 用户信息
-			searchToken() {
+			search() {
 				const that = this;
-				try {
-					const res = uni.getStorageSync('token');
-					if (res) {
-						uni.reLaunch({
-							url: `/pages/home/index`
-						})
+				uni.getStorage({
+					key: 'openid',
+					success: function(res) {
+						that.searchOpenid(res.data)
+					},
+					fail: function(err) {
+						uni.login({
+							success: async function(res) {
+								if (res.code) {
+									const aee = await that.$app('/wechat/api/login/app', 'GET', {
+										js_code: res.code,
+										config: that.$config.wx_projectkey
+									})
+									if (aee.errcode == '0') {
+										uni.setStorage({
+											key: "openid",
+											data: aee.data.openid
+										})
+										that.searchOpenid(aee.data.openid)
+									} else {
+										uni.showToast({
+											title: aee.errmsg,
+											icon: 'none'
+										})
+									}
+								} else {
+									uni.showToast({
+										title: res.errMsg,
+										icon: 'none'
+									})
+								}
+							}
+						});
 					}
-				} catch (e) {}
+				})
+			},
+			async searchOpenid(openid) {
+				const that = this;
+				const aee = await that.$api(`/login/wxapp/${openid}`, 'POST', {})
+				if (aee.errcode == '0') {
+					uni.setStorage({
+						key: "token",
+						data: aee.data
+					})
+					uni.reLaunch({
+						url: `/pages/home/index`
+					})
+				} else {
+					uni.showToast({
+						title: aee.errmsg,
+						icon: 'none'
+					})
+				}
 			},
 		},
 	}

pagesHome/friend/index.vue

@@ -180,11 +180,14 @@
 				const that = this
 				that.$set(that, `inrecord`, true);
 				that.$refs.voice.open('center')
-				that.record.start()
+				that.record.start({
+					format: "mp3"
+				})
 			},
 			// 长按结束录入语音
 			onEnd() {
 				const that = this
+				const fileUrl = that.$config.serverUrl;
 				that.$set(that, `inrecord`, false);
 				that.$refs.voice.close('center')
 				that.record.stop()
@@ -193,6 +196,26 @@
 					if (res.duration < 1000) {
 						return that.global.toast('请说话久一点')
 					}
+					// uni.saveFile({
+					// 	tempFilePath: res.tempFilePath,
+					// 	success: async (ans) => {
+					// 		const savedurl = ans.savedFilePath; // 移动后需要记录下存放在哪个目录下
+					// 		console.log("文件持久化成功----------------", savedurl)
+					// 		// 上传音频
+					// 		uni.uploadFile({
+					// 			url: `${fileUrl}/visit/api/files/applet/upload`,
+					// 			filePath: savedurl,
+					// 			name: `file.mp3`,
+					// 			formData: {},
+					// 			success: (arr) => {
+					// 				console.log('uploadImage success, arr is:', arr)
+					// 			},
+					// 			fail: (err) => {
+					// 				console.log('uploadImage fail', err);
+					// 			},
+					// 		});
+					// 	}
+					// });
 					let mess = {
 						type: 'record',
 						voice: Math.round(res.duration / 1000), // 时长

pagesMy/group/index.vue

@@ -13,11 +13,15 @@
 		<view class="two">
 			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
 				<view class="list-scroll-view">
-					<view class="list" v-for="(item, index) in list" :key="index" @tap="toView(item)">
-						<view class="title">{{item.name||'暂无群组名称'}}</view>
+					<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
+						<view class="name">{{item.name||'暂无群组名称'}}</view>
+						<view class="other textOver">
+							简介：{{item.content||'暂无'}}
+						</view>
 						<view class="button">
 							<button class="warning" size="mini" type="warn" @tap.stop="toEdit(item)">修改</button>
-							<button class="warning" size="mini" type="warn" @tap.stop="toCode(item)">群二维码</button>
+							<button class="warning" size="mini" type="warn" @tap.stop="toCode(item)">二维码</button>
+							<button class="warning" size="mini" type="warn" @tap.stop="toPerson(item)">成员</button>
 							<button class="danger" size="mini" type="warn" @tap.stop="toDel(item)">删除</button>
 						</view>
 					</view>
@@ -27,6 +31,7 @@
 				</view>
 			</scroll-view>
 		</view>
+		<!-- 修改/添加信息 -->
 		<uni-popup ref="popup" background-color="#fff" type="center" :is-mask-click="false" @change="change">
 			<view class="popup">
 				<view class="close">
@@ -46,6 +51,18 @@
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="code" background-color="#fff" type="center" :is-mask-click="false" @change="change">
+			<view class="popup">
+				<view class="close">
+					<text>二维码</text>
+					<uni-icons @tap="toClose" type="close" size="20"></uni-icons>
+				</view>
+				<view class="info_1">
+					二维码
+					<button class="button" size="mini" type="primary" @click="submit('valiForm')">保存二维码</button>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -146,7 +163,7 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.title) that.$set(that.searchInfo, `title`, e.detail.value)
+				if (that.searchInfo.name) that.$set(that.searchInfo, `name`, e.detail.value)
 				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();
@@ -157,9 +174,15 @@
 				that.$refs.popup.open()
 			},
 			// 二维码
-			toCode() {
+			toCode(item) {
+				const that = this;
+				that.$refs.code.open()
+				console.log(item);
+			},
+			// 成员
+			toPerson(item) {
 				const that = this;
-				console.log('二维码');
+				console.log(item);
 			},
 			// 修改
 			async toEdit(item) {
@@ -178,10 +201,13 @@
 			// 保存
 			submit(ref) {
 				const that = this;
-				that.$refs[ref].validate().then(async form => {
+				const form = that.form;
+				that.$refs[ref].validate().then(async data => {
 					let res;
-					if (form._id) res = await that.$api(`/group/${form._id}`, 'POST', form)
-					else res = await that.$api(`/group`, 'POST', form)
+					if (that.user.role == 'Doctor') data.doctor = that.user._id
+					else data.doctor = that.user.doctor
+					if (form._id) res = await that.$api(`/group/${form._id}`, 'POST', data)
+					else res = await that.$api(`/group`, 'POST', data)
 					if (res.errcode == '0') {
 						that.toClose();
 						that.clearPage();
@@ -222,6 +248,13 @@
 				const that = this;
 				that.$set(that, `form`, {})
 				that.$refs.popup.close();
+				that.$refs.code.close();
+			},
+			// 详情
+			toInfo(item) {
+				uni.navigateTo({
+					url: `/pagesHome/group/index?id=${item.id||item._id}&title=${item.name}`
+				})
 			},
 			// 分页
 			toPage(e) {
@@ -311,12 +344,17 @@
 				margin: 0 2vw 2vw 2vw;
 				border-radius: 5px;
 
-				.title {
+				.name {
 					font-size: var(--font14Size);
 					font-weight: bold;
 					padding: 2vw 0;
 				}
 
+				.other {
+					font-size: var(--font12Size);
+					color: var(--f85Color);
+				}
+
 
 				.button {
 					margin: 2vw 0 0 0;
@@ -345,7 +383,7 @@
 			display: flex;
 			flex-direction: column;
 			width: 90vw;
-			height: 35vh;
+			height: 45vh;
 			background-color: var(--f9Color);
 
 			.close {
@@ -363,7 +401,7 @@
 				position: relative;
 				display: flex;
 				flex-direction: column;
-				max-height: 30vh;
+				max-height: 40vh;
 				padding: 2vw;
 
 				.button {

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

@@ -34,7 +34,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 43);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _index_vue_vue_type_style_index_0_id_57280228_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=57280228&lang=scss&scoped=true& */ 45);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -142,8 +142,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 //
 //
 //
@@ -170,7 +170,7 @@ var _default = {
               return that.searchConfig();
             case 3:
               _context.next = 5;
-              return that.searchToken();
+              return that.search();
             case 5:
             case "end":
               return _context.stop();
@@ -213,17 +213,102 @@ var _default = {
         }, _callee2);
       }))();
     },
-    // 用户信息
-    searchToken: function searchToken() {
+    search: function search() {
       var that = this;
-      try {
-        var res = uni.getStorageSync('token');
-        if (res) {
-          uni.reLaunch({
-            url: "/pages/home/index"
+      uni.getStorage({
+        key: 'openid',
+        success: function success(res) {
+          that.searchOpenid(res.data);
+        },
+        fail: function fail(err) {
+          uni.login({
+            success: function () {
+              var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(res) {
+                var aee;
+                return _regenerator.default.wrap(function _callee3$(_context3) {
+                  while (1) {
+                    switch (_context3.prev = _context3.next) {
+                      case 0:
+                        if (!res.code) {
+                          _context3.next = 7;
+                          break;
+                        }
+                        _context3.next = 3;
+                        return that.$app('/wechat/api/login/app', 'GET', {
+                          js_code: res.code,
+                          config: that.$config.wx_projectkey
+                        });
+                      case 3:
+                        aee = _context3.sent;
+                        if (aee.errcode == '0') {
+                          uni.setStorage({
+                            key: "openid",
+                            data: aee.data.openid
+                          });
+                          that.searchOpenid(aee.data.openid);
+                        } else {
+                          uni.showToast({
+                            title: aee.errmsg,
+                            icon: 'none'
+                          });
+                        }
+                        _context3.next = 8;
+                        break;
+                      case 7:
+                        uni.showToast({
+                          title: res.errMsg,
+                          icon: 'none'
+                        });
+                      case 8:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }
+                }, _callee3);
+              }));
+              function success(_x) {
+                return _success.apply(this, arguments);
+              }
+              return success;
+            }()
           });
         }
-      } catch (e) {}
+      });
+    },
+    searchOpenid: function searchOpenid(openid) {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var that, aee;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                that = _this2;
+                _context4.next = 3;
+                return that.$api("/login/wxapp/".concat(openid), 'POST', {});
+              case 3:
+                aee = _context4.sent;
+                if (aee.errcode == '0') {
+                  uni.setStorage({
+                    key: "token",
+                    data: aee.data
+                  });
+                  uni.reLaunch({
+                    url: "/pages/home/index"
+                  });
+                } else {
+                  uni.showToast({
+                    title: aee.errmsg,
+                    icon: 'none'
+                  });
+                }
+              case 5:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))();
     }
   }
 };

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

@@ -34,7 +34,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 75);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _index_vue_vue_type_style_index_0_id_4586967a_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=4586967a&lang=scss&scoped=true& */ 77);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -142,8 +142,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 //
 //
 //

unpackage/dist/dev/mp-weixin/pagesHome/other/agree.js

@@ -130,7 +130,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _agree_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./agree.vue?vue&type=script&lang=js& */ 99);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _agree_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _agree_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _agree_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./agree.vue?vue&type=style&index=0&lang=scss& */ 101);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 

unpackage/dist/dev/mp-weixin/pagesMy/basic/index.js

@@ -34,7 +34,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 115);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _index_vue_vue_type_style_index_0_id_0166ed94_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=0166ed94&lang=scss&scoped=true& */ 117);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -142,11 +142,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 180));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 187));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/group/index.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "群组信息",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",

unpackage/dist/dev/mp-weixin/pagesMy/group/index.wxss

@@ -45,11 +45,15 @@
   margin: 0 2vw 2vw 2vw;
   border-radius: 5px;
 }
-.main .two .list .title.data-v-1761c2b6 {
+.main .two .list .name.data-v-1761c2b6 {
   font-size: var(--font14Size);
   font-weight: bold;
   padding: 2vw 0;
 }
+.main .two .list .other.data-v-1761c2b6 {
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
 .main .two .list .button.data-v-1761c2b6 {
   margin: 2vw 0 0 0;
   text-align: center;
@@ -70,7 +74,7 @@
   display: flex;
   flex-direction: column;
   width: 90vw;
-  height: 35vh;
+  height: 45vh;
   background-color: var(--f9Color);
 }
 .main .popup .close.data-v-1761c2b6 {
@@ -86,7 +90,7 @@
   position: relative;
   display: flex;
   flex-direction: column;
-  max-height: 30vh;
+  max-height: 40vh;
   padding: 2vw;
 }
 .main .popup .info_1 .button.data-v-1761c2b6 {

unpackage/dist/dev/mp-weixin/pagesScience/science/index.js

@@ -34,7 +34,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 107);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _index_vue_vue_type_style_index_0_id_70804fa6_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=70804fa6&lang=scss&scoped=true& */ 109);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -151,8 +151,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
 //
 //
 //

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js

@@ -13,7 +13,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _uni_collapse_item_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-collapse-item.vue?vue&type=script&lang=js& */ 145);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_collapse_item_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_collapse_item_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_collapse_item_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-collapse-item.vue?vue&type=style&index=0&lang=scss& */ 147);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 

unpackage/dist/dev/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js

@@ -13,7 +13,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _uni_collapse_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-collapse.vue?vue&type=script&lang=js& */ 138);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_collapse_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_collapse_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_collapse_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-collapse.vue?vue&type=style&index=0&lang=scss& */ 140);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 

unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js

@@ -13,7 +13,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _uni_icons_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-icons.vue?vue&type=script&lang=js& */ 175);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_icons_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_icons_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_icons_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-icons.vue?vue&type=style&index=0&lang=scss& */ 178);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 

unpackage/dist/dev/mp-weixin/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.js

@@ -13,7 +13,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _uni_list_chat_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-list-chat.vue?vue&type=script&lang=js& */ 152);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_list_chat_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_list_chat_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_list_chat_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-list-chat.vue?vue&type=style&index=0&lang=scss& */ 163);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js

@@ -13,7 +13,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=script&lang=js& */ 168);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_popup_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _uni_popup_vue_vue_type_style_index_0_lang_scss___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-popup.vue?vue&type=style&index=0&lang=scss& */ 170);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
 
@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniTransition: function () {
-      return Promise.all(/*! import() | uni_modules/uni-transition/components/uni-transition/uni-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-transition/components/uni-transition/uni-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-transition/components/uni-transition/uni-transition.vue */ 187))
+      return Promise.all(/*! import() | uni_modules/uni-transition/components/uni-transition/uni-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-transition/components/uni-transition/uni-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-transition/components/uni-transition/uni-transition.vue */ 217))
     },
   }
 } catch (e) {