优化界面展示

fir_client/src/components/FirAppInfosBase.vue

@@ -248,6 +248,8 @@
             '$store.state.currentapp': function () {
                 this.appinfos = this.$store.state.currentapp;
             },
+        }, destroyed() {
+            this.$store.dispatch('doucurrentapp', {});
         }
 
     }

fir_client/src/components/FirHeader.vue

@@ -21,15 +21,19 @@
             <el-row :gutter="20">
                 <el-col :span="14" style="padding-top: 16px;margin-left: 60px">
 
-                    <el-breadcrumb separator=">" style="height: 80px;font-size: 20px">
+                    <el-breadcrumb separator-class="el-icon-arrow-right" style="height: 80px;font-size: 20px">
-                        <el-breadcrumb-item :to="{ name:'FirIndex' }"><i class="el-icon-s-home elbi"></i>
+                        <el-breadcrumb-item :to="{ name:'FirIndex' }">首页</el-breadcrumb-item>
-                        </el-breadcrumb-item>
+                        <el-breadcrumb-item :to="{ name:'FirApps'}">我的应用</el-breadcrumb-item>
-                        <el-breadcrumb-item :to="{ name:'FirApps'}"><i class="el-icon-apple elbi"></i>
+
+                        <el-breadcrumb-item v-if="this.route_info.label" :to="{ name:route_info.name}">{{
+                            this.route_info.label }}
                         </el-breadcrumb-item>
+
                         <el-breadcrumb-item v-if="$store.state.currentapp.name"
                                             :to="{name: 'FirAppInfostimeline', params: {id: $store.state.currentapp.app_id}}">
                             {{ $store.state.currentapp.name}}
                         </el-breadcrumb-item>
+
                     </el-breadcrumb>
 
                 </el-col>
@@ -78,7 +82,8 @@
                 current_user: {},
                 appName: '',
                 token: '',
-                dialogVisible: false
+                dialogVisible: false,
+                route_info: {'name': '', 'label': ''},
             }
         }, methods: {
             maketoken() {
@@ -139,7 +144,11 @@
             this.appName = this.$route.params.id
         }, watch: {
             $route: function () {
-                this.appName = this.$route.params.id
+                this.appName = this.$route.params.id;
+                if (this.$route.meta) {
+                    this.route_info.label = this.$route.meta.label;
+                    this.route_info.name = this.$route.name;
+                }
             }
         }
     }
@@ -179,4 +188,5 @@
         color: #67c23a;
     }
 
+
 </style>

fir_client/src/components/FirUserOrders.vue

@@ -2,6 +2,34 @@
     <el-main>
 
 
+        <el-dialog title="微信支付，请扫描进行支付，支付完成之后，将订单进行关联"
+                   :visible.sync="wx_pay"
+                   width="880px"
+                   :close-on-click-modal="false"
+                   :close-on-press-escape="false"
+                   center
+        >
+            <el-row :gutter="8">
+                <el-col :span="12" style="text-align: center">
+                    <el-image :src="require('../assets/wx_pay.jpg')" style="width: 320px;height: 320px"
+                              fit="fit"></el-image>
+                    <el-link>用微信扫描二维码</el-link>
+                </el-col>
+                <el-col :span="12">
+                    <el-link type="warning"> 支付完成之后，打开订单详情，将订单编号复制出来，进行绑定</el-link>
+                    <div style="margin-top: 20px">
+                        <el-input style="width: 55%"
+                                  placeholder="订单编号"
+                                  v-model="sure_order_info.wx_order_id">
+                        </el-input>
+                        <el-button style="margin-left: 20px" @click="sure_order">查询</el-button>
+                        <el-button style="margin-left: 10px" @click="sure_order">关联</el-button>
+                    </div>
+                </el-col>
+            </el-row>
+
+        </el-dialog>
+
         <el-dialog
                 :visible.sync="show_order_info"
                 width="780px"
@@ -10,7 +38,6 @@
                 title="订单详情"
                 top="6vh"
                 center>
-
             <div>
 
                 <el-form :model="current_order_info"
@@ -41,12 +68,12 @@
 
                     <el-form-item label-width="110px" label="购买数量">
                         <el-input
-                                v-model="current_order_info.actual_download_times"/>
+                                :value="current_order_info.actual_download_times"/>
                     </el-form-item>
 
                     <el-form-item label-width="110px" label="赠送数量">
                         <el-input
-                                v-model="current_order_info.actual_download_gift_times"/>
+                                :value="current_order_info.actual_download_gift_times"/>
                     </el-form-item>
 
                     <el-form-item label-width="110px" label="订单创建时间">
@@ -90,6 +117,7 @@
 
             <el-table
                     :data="order_info_list"
+                    v-loading="loading"
                     border
                     stripe
                     style="width: 100%">
@@ -209,10 +237,13 @@
                 payment_type_choices: [],
                 show_order_info: false,
                 current_order_info: {},
+                wx_pay: false,
+                sure_order_info: {wx_order_id: ''},
+                loading: false
             }
         },
         methods: {
-            goto_pay(order) {
+            sure_order() {
                 my_order(res => {
                     // 应该跳转到第三方平台进行支付，然后第三方回调
                     if (res.code === 1000) {
@@ -225,9 +256,27 @@
                         this.$message.error("失败了 " + res.msg)
                     }
                 }, {
-                    methods: 'PUT', data: {order_number: order.order_number},
+                    methods: 'PUT', data: {sure_order_info: this.sure_order_info},
                 })
             },
+            goto_pay(order) {
+                this.wx_pay = true;
+                this.sure_order_info.order_number = order.order_number;
+                // my_order(res => {
+                //     // 应该跳转到第三方平台进行支付，然后第三方回调
+                //     if (res.code === 1000) {
+                //         this.$message.success("支付成功");
+                //         this.get_data_from_tabname({
+                //             "size": this.pagination.pagesize,
+                //             "page": this.pagination.currentPage
+                //         });
+                //     } else {
+                //         this.$message.error("失败了 " + res.msg)
+                //     }
+                // }, {
+                //     methods: 'PUT', data: {order_number: order.order_number},
+                // })
+            },
             click_order_info(order) {
                 this.show_order_info = true;
                 this.current_order_info = order;
@@ -237,7 +286,7 @@
                 this.pagination.pagesize = val;
                 this.get_data_from_tabname({
                     "size": this.pagination.pagesize,
-                    "page": this.pagination.currentPage
+                    "page": 1
                 })
             },
             handleCurrentChange(val) {
@@ -298,12 +347,7 @@
                     return '';
             },
             MyOrderFun(params) {
-                const loading = this.$loading({
+                this.loading = true;
-                    lock: true,
-                    text: '执行中,请耐心等待...',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(0, 0, 0, 0.7)'
-                });
                 my_order(data => {
                     if (data.code === 1000) {
                         this.order_info_list = data.data;
@@ -317,8 +361,7 @@
                     } else {
                         this.$message.error("操作失败")
                     }
-
+                    this.loading = false;
-                    loading.close();
                 }, {methods: 'GET', data: params})
             },
             getUserInfoFun() {

fir_client/src/router/index.js

@@ -104,18 +104,20 @@ const router = new VueRouter({
                         {
                             path: 'info',
                             name: 'FirUserProfileInfo',
-                            // component: FirUserProfileInfo,
+                            meta: {label: '个人资料'},
                             component: () => import("@/components/FirUserProfileInfo"),
 
                         }, {
                             path: 'setpasswd',
                             name: 'FirUserProfileChangePwd',
+                            meta: {label: '修改密码'},
                             // component: FirUserProfileChangePwd
                             component: () => import("@/components/FirUserProfileChangePwd"),
 
                         }, {
                             path: 'certification',
                             name: 'FirUserProfileCertification',
+                            meta: {label: '实名认证'},
                             component: () => import("@/components/FirUserProfileCertification"),
 
                         },
@@ -140,7 +142,7 @@ const router = new VueRouter({
                 {
                     path: ':act',
                     name: 'FirSuperSignBase',
-                    // component: FirSuperSignBase,
+                    meta: {label: '超级签名'},
                     component: () => import("@/components/FirSuperSignBase"),
 
                 }
@@ -150,12 +152,11 @@ const router = new VueRouter({
             path: '/storage',
             // component: FirAppBase,
             component: () => import("@/components/FirAppBase"),
-
             children: [
                 {
                     path: ':act',
                     name: 'FirUserStorage',
-                    // component: FirUserProfileStorage
+                    meta: {label: '存储管理'},
                     component: () => import("@/components/FirUserStorage"),
 
                 }
@@ -168,6 +169,7 @@ const router = new VueRouter({
                 {
                     path: '',
                     name: 'FirUserOrders',
+                    meta: {label: '订单详情'},
                     component: () => import("@/components/FirUserOrders"),
 
                 }