修改微信登录

App.vue

@@ -6,48 +6,11 @@
 		},
 		onShow: function() {
 			const that = this;
-			that.search();
 		},
 		onHide: function() {
 			console.log('App Hide')
 		},
 		methods: {
-			search() {
-				const that = this;
-				uni.login({
-					success: function(res) {
-						if (res.code) {
-							uni.getStorage({
-								key: 'openid',
-								success: function(res) {},
-								fail: async function(err) {
-									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
-										})
-									} else {
-										uni.showToast({
-											title: aee.errmsg,
-											icon: 'none'
-										})
-									}
-								}
-							})
-						} else {
-							uni.showToast({
-								title: res.errMsg,
-								icon: 'none'
-							})
-						}
-					}
-				});
-
-			},
 			// 强制更新
 			forceUpdate() {
 				const that = this;

pages/home/index.vue

@@ -13,7 +13,10 @@
 				<uni-collapse-item title="群组" :thumb="config.group_url[0].url">
 					<view class="content">
 						<view class="list" v-for="(item, index) in groupList" :key="index" @tap="toInfo(item)">
-							1111
+							<uni-list-chat title="uni-app"
+								avatar="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png"
+								note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left"
+								badge-text="99"></uni-list-chat>
 						</view>
 						<view class="is_bottom" v-if="is_bottom">
 							<text>{{config.bottom_title||'到底了！'}}</text>
@@ -23,7 +26,10 @@
 				<uni-collapse-item title="好友" :thumb="config.friend_url[0].url">
 					<view class="content">
 						<view class="list" v-for="(item, index) in friendList" :key="index" @tap="toInfo(item)">
-							1111
+							<uni-list-chat title="uni-app"
+								avatar="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png"
+								note="您收到一条新的消息" time="2020-02-02 20:20" badge-positon="left"
+								badge-text="99"></uni-list-chat>
 						</view>
 						<view class="is_bottom" v-if="is_bottom">
 							<text>{{config.bottom_title||'到底了！'}}</text>
@@ -44,9 +50,13 @@
 				// 广告
 				advertList: [],
 				// 群组
-				groupList: [],
+				groupList: [{
+					id: '1'
+				}],
 				// 好友
-				friendList: []
+				friendList: [{
+					id: '1'
+				}]
 			}
 		},
 		onShow: async function() {
@@ -113,7 +123,7 @@
 			padding: 0 0 2vw 0;
 
 			.swiper {
-				height: 60vw;
+				height: 70vw;
 
 				.list {
 					.image {

pages/index/index.vue

@@ -15,49 +15,74 @@
 		},
 		onShow: async function() {
 			const that = this;
+			await that.search();
 			await that.searchConfig();
-			await that.searchOpenid();
 		},
 		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 searchConfig() {
 				const that = this;
-				let res = await that.$api(`/config`, 'GET', {});
+				const res = await that.$api(`/config`, 'GET', {});
 				if (res.errcode == '0') {
 					that.$set(that, `logoUrl`, res.data.logo_url[0].url);
 					uni.setStorage({
 						key: 'config',
 						data: res.data,
 						success: function(res) {},
-						fail: function(err) {
-							console.log(err);
-						}
+						fail: function(err) {}
 					})
 				}
 			},
-			async searchOpenid() {
+			async searchOpenid(openid) {
 				const that = this;
-				try {
-					const res = uni.getStorageSync('openid');
-					if (res) {
-						const aee = await that.$api(`/login/wxapp/${res}`, 'POST', {})
-						if (aee.errcode == '0') {
-							uni.reLaunch({
-								url: `/pages/home/index`
-							})
-						} else {
-							uni.showToast({
-								title: aee.errmsg,
-								icon: 'none'
-							})
-						}
-					}
-				} catch (e) {
+				const aee = await that.$api(`/login/wxapp/${openid}`, 'POST', {})
+				if (aee.errcode == '0') {
+					uni.reLaunch({
+						url: `/pages/home/index`
+					})
+				} else {
 					uni.showToast({
-						title: err.errmsg,
-						icon: 'error',
-						duration: 2000
-					});
+						title: aee.errmsg,
+						icon: 'none'
+					})
 				}
 				uni.reLaunch({
 					url: `/pages/home/index`

unpackage/dist/dev/mp-weixin/common/main.js

@@ -108,13 +108,10 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
-var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 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 _default = {
   onLaunch: function onLaunch() {
     var that = this;
@@ -122,67 +119,11 @@ var _default = {
   },
   onShow: function onShow() {
     var that = this;
-    that.search();
   },
   onHide: function onHide() {
     console.log('App Hide');
   },
   methods: {
-    search: function search() {
-      var that = this;
-      uni.login({
-        success: function success(res) {
-          if (res.code) {
-            uni.getStorage({
-              key: 'openid',
-              success: function success(res) {},
-              fail: function () {
-                var _fail = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(err) {
-                  var aee;
-                  return _regenerator.default.wrap(function _callee$(_context) {
-                    while (1) {
-                      switch (_context.prev = _context.next) {
-                        case 0:
-                          _context.next = 2;
-                          return that.$app('/wechat/api/login/app', 'GET', {
-                            js_code: res.code,
-                            config: that.$config.wx_projectkey
-                          });
-                        case 2:
-                          aee = _context.sent;
-                          if (aee.errcode == '0') {
-                            uni.setStorage({
-                              key: "openid",
-                              data: aee.data.openid
-                            });
-                          } else {
-                            uni.showToast({
-                              title: aee.errmsg,
-                              icon: 'none'
-                            });
-                          }
-                        case 4:
-                        case "end":
-                          return _context.stop();
-                      }
-                    }
-                  }, _callee);
-                }));
-                function fail(_x) {
-                  return _fail.apply(this, arguments);
-                }
-                return fail;
-              }()
-            });
-          } else {
-            uni.showToast({
-              title: res.errMsg,
-              icon: 'none'
-            });
-          }
-        }
-      });
-    },
     // 强制更新
     forceUpdate: function forceUpdate() {
       var that = this;

unpackage/dist/dev/mp-weixin/pages/home/index.json

@@ -4,6 +4,7 @@
   "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
-    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item"
+    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item",
+    "uni-list-chat": "/uni_modules/uni-list/components/uni-list-chat/uni-list-chat"
   }
 }

unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -5,7 +5,7 @@
   padding: 0 0 2vw 0;
 }
 .main .one .swiper.data-v-71e217db {
-  height: 60vw;
+  height: 70vw;
 }
 .main .one .swiper .list .image.data-v-71e217db {
   width: 100%;

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

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

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

@@ -0,0 +1,185 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-list-chat {
+  font-size: 16px;
+  position: relative;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #fff;
+}
+.uni-list-chat--hover {
+  background-color: #f5f5f5;
+}
+.uni-list--border {
+  position: relative;
+  margin-left: 15px;
+}
+.uni-list--border:after {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  height: 1px;
+  content: '';
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  background-color: #e5e5e5;
+}
+.uni-list-item--first:after {
+  height: 0px;
+}
+.uni-list-chat--first {
+  border-top-width: 0px;
+}
+.uni-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.uni-ellipsis-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+.uni-list-chat__container {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  flex: 1;
+  padding: 10px 15px;
+  position: relative;
+  overflow: hidden;
+}
+.uni-list-chat__header-warp {
+  position: relative;
+}
+.uni-list-chat__header {
+  display: flex;
+  align-content: center;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap-reverse;
+  width: 45px;
+  height: 45px;
+  border-radius: 5px;
+  border-color: #eee;
+  border-width: 1px;
+  border-style: solid;
+  overflow: hidden;
+}
+.uni-list-chat__header-box {
+  box-sizing: border-box;
+  display: flex;
+  width: 45px;
+  height: 45px;
+  overflow: hidden;
+  border-radius: 2px;
+}
+.uni-list-chat__header-image {
+  margin: 1px;
+  width: 45px;
+  height: 45px;
+}
+.uni-list-chat__header-image {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.avatarItem--1 {
+  width: 100%;
+  height: 100%;
+}
+.avatarItem--2 {
+  width: 47%;
+  height: 47%;
+}
+.avatarItem--3 {
+  width: 32%;
+  height: 32%;
+}
+.header--circle {
+  border-radius: 50%;
+}
+.uni-list-chat__content {
+  display: flex;
+  flex-direction: row;
+  flex: 1;
+  overflow: hidden;
+  padding: 2px 0;
+}
+.uni-list-chat__content-main {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding-left: 10px;
+  flex: 1;
+  overflow: hidden;
+}
+.uni-list-chat__content-title {
+  font-size: 16px;
+  color: #3b4144;
+  font-weight: normal;
+  overflow: hidden;
+}
+.draft, .uni-list-chat__content-note {
+  margin-top: 3px;
+  color: #999;
+  font-size: 12px;
+  font-weight: normal;
+  overflow: hidden;
+}
+.draft {
+  color: #eb3a41;
+  flex-shrink: 0;
+  padding-right: 3px;
+}
+.uni-list-chat__content-extra {
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: flex-end;
+  margin-left: 5px;
+}
+.uni-list-chat__content-extra-text {
+  color: #999;
+  font-size: 12px;
+  font-weight: normal;
+  overflow: hidden;
+}
+.uni-list-chat__badge-pos {
+  position: absolute;
+  left: calc(45px + 10px - 6px + 0px);
+  top: calc(10px/ 2 + 1px + 0px);
+}
+.uni-list-chat__badge {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 100px;
+  background-color: #ff5a5f;
+}
+.uni-list-chat__badge-text {
+  color: #fff;
+  font-size: 12px;
+}
+.uni-badge--single {
+  width: 18px;
+  height: 18px;
+}
+.uni-badge--complex {
+  width: auto;
+  height: 18px;
+  padding: 0 6px;
+}
+.uni-badge--dot {
+  left: calc(45px + 15px - 10px/ 2 + 1px + 0px);
+  width: 10px;
+  height: 10px;
+  padding: 0;
+}
+