登录

mallApp/src/pages/login/index.vue

@@ -51,6 +51,13 @@ export default {
             if(this.needBack == 1){
               that.$msg('登录成功')
               setTimeout(function(){
+
+                //返回上一页带参数
+                let pages = getCurrentPages();
+                let prevPage = pages[ pages.length - 2 ];
+                //修改上一页data里面的灵气
+                prevPage.$vm.loginComeBack = 1
+
                 uni.navigateBack({})
               },1500)
             }else{

mallApp/src/pages/order/list.vue

@@ -26,45 +26,79 @@
     <block v-else>
       <app-wrapper-empty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
     </block>
+		<wangCg :loginStatus.sync="loginStatus" @goToLogin="loginTo()"></wangCg>
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex'
 import ListModule from "@/components/module/app-order-list";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { list } from "@/mixins";
 import { getList } from "@/api/order";
+import wangCg from "@/components/wangCg";
 export default {
   name: "order-list",
   components: {
     ListModule,
+    wangCg,
     AppWrapperEmpty
   },
   mixins: [list],
   data() {
-    return {};
+    return {
+      loginStatus:0,
+      loginComeBack:0
+    };
   },
   onPullDownRefresh() {
     this.resetList();
-    this._list().then(res => {
+    this.getOrderList().then(res => {
       uni.stopPullDownRefresh();
     });
   },
   // 加载更多
   onReachBottom() {
     if (this.list.moreData == 1) {
-      this._list().then(res => {
+      this.getOrderList().then(res => {
         uni.stopPullDownRefresh();
       });
     } else {
       uni.stopPullDownRefresh();
     }
   },
-  onLoad: function() {},
+	computed: {
+    	...mapGetters({ loginInfo:"getLoginInfo" })
+	},
+	watch: {
+		loginInfo: {
+			deep: true,
+			handler: function(newVal) {
+				if(!this.$util.isEmpty(newVal)){
+					this.loginStatus = 1
+				}else{
+					this.loginStatus = 0
+				}
+			},
+			immediate:true
+		}
+	},
+  onLoad: function() {
+
+  },
+  onShow(){
+    if(this.loginComeBack == 1){
+      this.init()
+      this.loginComeBack = 0
+    }
+  },
   methods: {
     async init() {
-      this._list();
+      this.getOrderList();
     },
-    _list() {
+		loginTo() {
+			this.$util.pageTo({url:"/pages/login/index?needBack=1"})
+		},
+    getOrderList() {
       return getList({ status: this.tabIndex }).then(res => {
         this.completes(res);
       });