star7th 5 years ago
parent
commit
8c59a72ab9

+ 1 - 1
server/Application/Api/Controller/MockController.class.php

@@ -64,7 +64,7 @@ class MockController extends BaseController {
 
 
     // 根据唯一key获取mock的响应数据
     // 根据唯一key获取mock的响应数据
     public function infoByKey(){
     public function infoByKey(){
-        $unique_key = I("unique_key");  
+        $unique_key = $_REQUEST["unique_key"];  
         $page = D("Mock")->where(" unique_key = '%s' ",array($unique_key))->find();
         $page = D("Mock")->where(" unique_key = '%s' ",array($unique_key))->find();
         $template = $page['template'] ;
         $template = $page['template'] ;
         $res = http_post("http://127.0.0.1:7123/mock",array(
         $res = http_post("http://127.0.0.1:7123/mock",array(

+ 1 - 1
web_src/src/components/admin/attachment/Index.vue

@@ -27,7 +27,7 @@
       <el-table-column prop="visit_times" :label="$t('visit_times')"></el-table-column>
       <el-table-column prop="visit_times" :label="$t('visit_times')"></el-table-column>
       <el-table-column prop="username" :label="$t('uploader')"></el-table-column>
       <el-table-column prop="username" :label="$t('uploader')"></el-table-column>
       <el-table-column prop="addtime" :label="$t('add_time')" width="160"></el-table-column>
       <el-table-column prop="addtime" :label="$t('add_time')" width="160"></el-table-column>
-      <el-table-column prop :label="operation">
+      <el-table-column prop :label="$t('operation')">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <el-button @click="visit(scope.row)" type="text" size="small">{{$t('visit')}}</el-button>
           <el-button @click="visit(scope.row)" type="text" size="small">{{$t('visit')}}</el-button>
           <el-button @click="delete_row(scope.row)" type="text" size="small">{{$t('delete')}}</el-button>
           <el-button @click="delete_row(scope.row)" type="text" size="small">{{$t('delete')}}</el-button>

+ 1 - 1
web_src/src/components/attachment/Index.vue

@@ -41,7 +41,7 @@
           <el-table-column prop="file_size_m" :label="$t('file_size_m')" width="160"></el-table-column>
           <el-table-column prop="file_size_m" :label="$t('file_size_m')" width="160"></el-table-column>
           <el-table-column prop="visit_times" :label="$t('visit_times')"></el-table-column>
           <el-table-column prop="visit_times" :label="$t('visit_times')"></el-table-column>
           <el-table-column prop="addtime" :label="$t('add_time')" width="160"></el-table-column>
           <el-table-column prop="addtime" :label="$t('add_time')" width="160"></el-table-column>
-          <el-table-column prop :label="operation">
+          <el-table-column prop :label="$t('operation')">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-button @click="visit(scope.row)" type="text" size="small">{{$t('visit')}}</el-button>
               <el-button @click="visit(scope.row)" type="text" size="small">{{$t('visit')}}</el-button>
               <el-button @click="delete_row(scope.row)" type="text" size="small">{{$t('delete')}}</el-button>
               <el-button @click="delete_row(scope.row)" type="text" size="small">{{$t('delete')}}</el-button>

+ 4 - 1
web_src/src/components/item/show/show_regular_item/LeftMenu.vue

@@ -40,7 +40,7 @@
         <template v-if="menu.pages && menu.pages.length ">
         <template v-if="menu.pages && menu.pages.length ">
           <el-menu-item v-for="(page ) in menu.pages" :index="page.page_id" :key="page.page_id">
           <el-menu-item v-for="(page ) in menu.pages" :index="page.page_id" :key="page.page_id">
             <i class="el-icon-document"></i>
             <i class="el-icon-document"></i>
-            <span :title="page.page_title">{{page.page_title}}</span>
+            <span :title="page.page_title" :id="'left_page_'+page.page_id">{{page.page_title}}</span>
           </el-menu-item>
           </el-menu-item>
         </template>
         </template>
 
 
@@ -93,6 +93,9 @@ export default {
 
 
     // 改变url
     // 改变url
     change_url(page_id) {
     change_url(page_id) {
+      if (page_id > 0 && page_id == this.$route.query.page_id) {
+        return
+      }
       var domain = this.item_info.item_domain
       var domain = this.item_info.item_domain
         ? this.item_info.item_domain
         ? this.item_info.item_domain
         : this.item_info.item_id
         : this.item_info.item_id

+ 1 - 1
web_src/src/components/page/edit/Filehub.vue

@@ -44,7 +44,7 @@
           <el-table-column prop="file_size_m" :label="$t('file_size_m')" width="160"></el-table-column>
           <el-table-column prop="file_size_m" :label="$t('file_size_m')" width="160"></el-table-column>
           <el-table-column prop="visit_times" :label="$t('visit_times')"></el-table-column>
           <el-table-column prop="visit_times" :label="$t('visit_times')"></el-table-column>
           <el-table-column prop="addtime" :label="$t('add_time')" width="160"></el-table-column>
           <el-table-column prop="addtime" :label="$t('add_time')" width="160"></el-table-column>
-          <el-table-column prop :label="operation">
+          <el-table-column prop :label="$t('operation')">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-button @click="select(scope.row)" type="text" size="small">{{$t('select')}}</el-button>
               <el-button @click="select(scope.row)" type="text" size="small">{{$t('select')}}</el-button>
               <el-button @click="visit(scope.row)" type="text" size="small">{{$t('visit')}}</el-button>
               <el-button @click="visit(scope.row)" type="text" size="small">{{$t('visit')}}</el-button>