修改意见反馈

components/upload/index.vue

@@ -90,13 +90,11 @@
 				width: 25vw;
 				height: 25vw;
 				text-align: center;
-				border-radius: 25vw;
-				border: 1px solid var(--f9Color);
+				border: 1px solid var(--f99Color);
 
 				.image {
 					width: 100%;
 					height: 100%;
-					border-radius: 25vw;
 				}
 
 				.add {
@@ -106,8 +104,8 @@
 
 				.del {
 					position: absolute;
-					right: 0;
-					top: 0;
+					right: -10px;
+					top: -10px;
 				}
 			}
 

pagesHome/article/index.vue

@@ -47,9 +47,17 @@
 					</uni-easyinput>
 				</view>
 				<view class="right">
-					<view class="right_1"><text class="iconfont icon-aixin"></text>{{like}}</view>
-					<view class="right_1"><text class="iconfont icon-shoucang1"></text>{{collect}}</view>
-					<view class="right_1" @click="pageScroll"><text class="iconfont icon-pinglun"></text>{{total}}
+					<view class="right_1">
+						<text class="iconfont icon-aixin"></text>
+						<text>{{like||0}}</text>
+					</view>
+					<view class="right_1">
+						<text class="iconfont icon-shoucang1"></text>
+						<text>{{collect||0}}</text>
+					</view>
+					<view class="right_1" @click="pageScroll">
+						<text class="iconfont icon-pinglun"></text>
+						<text>{{total||0}}</text>
 					</view>
 				</view>
 			</view>
@@ -329,7 +337,7 @@
 
 						.iconfont {
 							padding: 0 1vw;
-							font-size: 21px;
+							font-size: 18px;
 						}
 					}
 				}

pagesIndex/login/index.vue

@@ -83,18 +83,17 @@
 								token: res.data
 							});
 							if (token.errcode == '0') {
-								that.$set(that, `user`, token.data);
-								// 登录成功
-								uni.getUserInfo({
-									provider: 'weixin',
-									success: function(info) {
-										// 修改用户信息
-										that.updatePhone({
-											nick_name: info.userInfo.nickName,
-											logo: [{
-												url: info.userInfo.avatarUrl
-											}],
+								let arr = await that.$api(`/user/${token.data._id}`, 'GET', {})
+								uni.setStorage({
+									key: 'token',
+									data: arr.data,
+									success: function(res) {
+										uni.navigateBack({
+											delta: 1
 										})
+									},
+									fail: function(err) {
+										console.log(err);
 									}
 								})
 							}

pagesMy/account/index.vue

@@ -92,7 +92,6 @@
 				try {
 					const res = uni.getStorageSync('token');
 					if (res) {
-						res.gender_name
 						that.$set(that, `user`, res);
 					}
 				} catch (e) {

pagesMy/opinion/index.vue

@@ -1,20 +1,113 @@
 <template>
 	<view class="main">
-		系统首页
+		<uni-forms class="form" ref="form" :rules="rules" :modelValue="form" label-position="top" label-width='100'>
+			<uni-forms-item label="建议描述(必填)" required name="content">
+				<uni-easyinput type="textarea" v-model="form.content" placeholder="请输入建议描述" />
+			</uni-forms-item>
+			<uni-forms-item label="上传图片0/3(选填)" name="file">
+				<upload class='upload' :list="form.file" name="file" :count="3" @uplSuc="uplSuc" @uplDel="uplDel">
+				</upload>
+			</uni-forms-item>
+			<uni-forms-item label="联系方式(选填)" name="phone">
+				<uni-easyinput v-model="form.phone" placeholder="请输入您的手机号" />
+			</uni-forms-item>
+		</uni-forms>
+		<button class="button" type="primary" @click="submit('form')">提交</button>
 	</view>
 </template>
 
 <script>
+	import upload from '../../components/upload/index.vue';
 	export default {
+		components: {
+			upload
+		},
 		data() {
-			return {}
+			return {
+				user: {},
+				form: {
+					file: []
+				},
+				// 校验规则
+				rules: {
+					content: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入建议描述'
+						}]
+					},
+				},
+			}
+		},
+		onLoad: function(e) {
+			const that = this;
+			that.searchToken();
 		},
 		methods: {
-
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 图片上传
+			uplSuc(e) {
+				const that = this;
+				that.$set(that.form, `${e.name}`, [...that.form[e.name], e.data]);
+			},
+			// 图片删除
+			uplDel(e) {
+				const that = this;
+				let data = that.form[e.name];
+				let arr = data.filter((i, index) => index != e.data.index);
+				that.$set(that.form, `${e.name}`, arr)
+			},
+			submit(ref) {
+				this.$refs[ref].validate().then(async data => {
+					data.user = this.user._id
+					const res = await that.$api(`/opinion`, 'POST', data);
+					if (res.errcode == '0') {
+						uni.showToast({
+							title: '意见反馈成功',
+							icon: 'none'
+						})
+						uni.navigateBack({
+							delta: 1
+						})
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				}).catch(err => {
+					console.log('err', err);
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		padding: 4vw;
+
+		.form-item {
+			display: flex;
+			align-items: center;
+		}
+
+		.button {
+			background-color: var(--f3CColor);
+		}
+	}
 </style>

unpackage/dist/dev/mp-weixin/components/upload/index.wxss

@@ -13,13 +13,11 @@
   width: 25vw;
   height: 25vw;
   text-align: center;
-  border-radius: 25vw;
-  border: 1px solid var(--f9Color);
+  border: 1px solid var(--f99Color);
 }
 .upload .upload_1 .list .image {
   width: 100%;
   height: 100%;
-  border-radius: 25vw;
 }
 .upload .upload_1 .list .add {
   position: relative;
@@ -27,8 +25,8 @@
 }
 .upload .upload_1 .list .del {
   position: absolute;
-  right: 0;
-  top: 0;
+  right: -10px;
+  top: -10px;
 }
 .upload .upload_1 .list:nth-child(3n) {
   margin: 0 0 2vw 0;

unpackage/dist/dev/mp-weixin/pagesHome/article/index.wxss

@@ -64,7 +64,7 @@
 }
 .main .foot .foot_1 .right .right_1 .iconfont.data-v-344a728f {
   padding: 0 1vw;
-  font-size: 21px;
+  font-size: 18px;
 }
 .scroll-view.data-v-344a728f {
   position: absolute;

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

@@ -233,7 +233,7 @@ var _default = {
     otherLogin: function otherLogin() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var that, agree, openid, _res2, token;
+        var that, agree, openid, _res2, token, arr;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -242,11 +242,11 @@ var _default = {
                 agree = that.agree;
                 openid = that.openid;
                 if (!agree) {
-                  _context2.next = 21;
+                  _context2.next = 25;
                   break;
                 }
                 if (!openid) {
-                  _context2.next = 18;
+                  _context2.next = 22;
                   break;
                 }
                 _context2.next = 7;
@@ -256,7 +256,7 @@ var _default = {
               case 7:
                 _res2 = _context2.sent;
                 if (!(_res2.errcode == '0')) {
-                  _context2.next = 15;
+                  _context2.next = 19;
                   break;
                 }
                 _context2.next = 11;
@@ -265,46 +265,51 @@ var _default = {
                 });
               case 11:
                 token = _context2.sent;
-                if (token.errcode == '0') {
-                  that.$set(that, "user", token.data);
-                  // 登录成功
-                  uni.getUserInfo({
-                    provider: 'weixin',
-                    success: function success(info) {
-                      // 修改用户信息
-                      that.updatePhone({
-                        nick_name: info.userInfo.nickName,
-                        logo: [{
-                          url: info.userInfo.avatarUrl
-                        }]
-                      });
-                    }
-                  });
+                if (!(token.errcode == '0')) {
+                  _context2.next = 17;
+                  break;
                 }
-                _context2.next = 16;
-                break;
+                _context2.next = 15;
+                return that.$api("/user/".concat(token.data._id), 'GET', {});
               case 15:
+                arr = _context2.sent;
+                uni.setStorage({
+                  key: 'token',
+                  data: arr.data,
+                  success: function success(res) {
+                    uni.navigateBack({
+                      delta: 1
+                    });
+                  },
+                  fail: function fail(err) {
+                    console.log(err);
+                  }
+                });
+              case 17:
+                _context2.next = 20;
+                break;
+              case 19:
                 uni.showToast({
                   title: _res2.errmsg || '信息错误',
                   icon: 'none'
                 });
-              case 16:
-                _context2.next = 19;
+              case 20:
+                _context2.next = 23;
                 break;
-              case 18:
+              case 22:
                 uni.showToast({
                   title: '系统更新中，请稍后再试!',
                   icon: 'none'
                 });
-              case 19:
-                _context2.next = 22;
+              case 23:
+                _context2.next = 26;
                 break;
-              case 21:
+              case 25:
                 uni.showToast({
                   title: '请阅读并同意用户协议和隐私政策',
                   icon: 'none'
                 });
-              case 22:
+              case 26:
               case "end":
                 return _context2.stop();
             }

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

@@ -146,7 +146,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 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 */ 179));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 206));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -214,7 +214,6 @@ var _default = {
       try {
         var res = uni.getStorageSync('token');
         if (res) {
-          res.gender_name;
           that.$set(that, "user", res);
         }
       } catch (e) {

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

@@ -1,4 +1,9 @@
 {
   "navigationBarTitleText": "意见反馈",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "upload": "/components/upload/index"
+  }
 }

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

@@ -1,3 +1,14 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-df6825b0 {
+  padding: 4vw;
+}
+.main .form-item.data-v-df6825b0 {
+  display: flex;
+  align-items: center;
+}
+.main .button.data-v-df6825b0 {
+  background-color: var(--f3CColor);
+}
 

unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.json

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

unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.wxss

@@ -0,0 +1,97 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-forms-item {
+  position: relative;
+  display: flex;
+  margin-bottom: 22px;
+  flex-direction: row;
+}
+.uni-forms-item__label {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  text-align: left;
+  font-size: 14px;
+  color: #606266;
+  height: 36px;
+  padding: 0 12px 0 0;
+  vertical-align: middle;
+  flex-shrink: 0;
+  box-sizing: border-box;
+}
+.uni-forms-item__label.no-label {
+  padding: 0;
+}
+.uni-forms-item__content {
+  position: relative;
+  font-size: 14px;
+  flex: 1;
+  box-sizing: border-box;
+  flex-direction: row;
+}
+.uni-forms-item .uni-forms-item__nuve-content {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+.uni-forms-item__error {
+  color: #f56c6c;
+  font-size: 12px;
+  line-height: 1;
+  padding-top: 4px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  transition: -webkit-transform 0.3s;
+  transition: transform 0.3s;
+  transition: transform 0.3s, -webkit-transform 0.3s;
+  -webkit-transform: translateY(-100%);
+          transform: translateY(-100%);
+  opacity: 0;
+}
+.uni-forms-item__error .error-text {
+  color: #f56c6c;
+  font-size: 12px;
+}
+.uni-forms-item__error.msg--active {
+  opacity: 1;
+  -webkit-transform: translateY(0%);
+          transform: translateY(0%);
+}
+.uni-forms-item.is-direction-left {
+  flex-direction: row;
+}
+.uni-forms-item.is-direction-top {
+  flex-direction: column;
+}
+.uni-forms-item.is-direction-top .uni-forms-item__label {
+  padding: 0 0 8px;
+  line-height: 1.5715;
+  text-align: left;
+  white-space: initial;
+}
+.uni-forms-item .is-required {
+  color: #dd524d;
+  font-weight: bold;
+}
+.uni-forms-item--border {
+  margin-bottom: 0;
+  padding: 10px 0;
+  border-top: 1px #eee solid;
+}
+.uni-forms-item--border .uni-forms-item__content {
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.uni-forms-item--border .uni-forms-item__content .uni-forms-item__error {
+  position: relative;
+  top: 5px;
+  left: 0;
+  padding-top: 0;
+}
+.is-first-border {
+  border: none;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.json

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

unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.wxml

@@ -0,0 +1 @@
+<view class="uni-forms"><form><slot></slot></form></view>

unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.wxss

@@ -0,0 +1,4 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+

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

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 200))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 220))
     },
   }
 } catch (e) {