Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_merchant_ui

src/views/system/user/profile/index.vue

@@ -13,11 +13,11 @@
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
-                <div class="pull-right">{{ user.userName }}</div>
+                <div class="pull-right">{{ user.name }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ user.phonenumber }}</div>
+                <div class="pull-right">{{ user.mobile }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱

src/views/system/user/profile/userInfo.vue

@@ -2,9 +2,9 @@
   <el-form ref="form" :model="form" :rules="rules" label-width="80px">
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="form.nickName" maxlength="30" />
-    </el-form-item> 
-    <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="form.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="手机号码" prop="mobile">
+      <el-input v-model="form.mobile" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="form.email" maxlength="50" />
@@ -47,7 +47,7 @@ export default {
             trigger: ["blur", "change"]
           }
         ],
-        phonenumber: [
+        mobile: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -62,7 +62,7 @@ export default {
     user: {
       handler(user) {
         if (user) {
-          this.form = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex };
+          this.form = { id:user.id, nickName: user.nickName, mobile: user.mobile, email: user.email, sex: user.sex };
         }
       },
       immediate: true
@@ -74,7 +74,7 @@ export default {
         if (valid) {
           updateUserProfile(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
-            this.user.phonenumber = this.form.phonenumber;
+            this.user.mobile = this.form.mobile;
             this.user.email = this.form.email;
           });
         }

src/views/tourism/productManagement/scenicAreaTickets.vue

@@ -16,24 +16,24 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
           </el-row>
-  
+
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
             <el-table-column type="index" label="序号" align="center"  />
             <el-table-column label="票务名称" align="center" key="name" prop="name" v-if="columns[0].visible" :show-overflow-tooltip="true" />
             <el-table-column label="票务规格" align="center" key="goodsName" prop="goodsName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
             <el-table-column label="可用状态" align="center" key="status" prop="status" v-if="columns[2].visible">
                 <template slot-scope="scope">
-                  <switchBox 
-                  :defaultChecked="true" 
-                  v-model="scope.row.status" 
-                  @changeFun="openAttraction(scope.row)" 
+                  <switchBox
+                  :defaultChecked="true"
+                  v-model="scope.row.status"
+                  @changeFun="openAttraction(scope.row)"
                   :disabled="false"
                   :active-value="1"
                   :inactive-value="0"
                   />
                 </template>
             </el-table-column>
-            <el-table-column label="发布时间" align="center" key="goodsName1" prop="goodsName1" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="发布时间" align="center" key="onlineTime" prop="onlineTime" v-if="columns[3].visible" :show-overflow-tooltip="true" />
             <el-table-column
               label="操作"
               align="center"
@@ -64,7 +64,7 @@
               </template>
             </el-table-column>
           </el-table>
-  
+
           <pagination
             v-show="total>0"
             :total="total"
@@ -79,11 +79,11 @@
       <addAndEditSpecs ref="addAndEditSpecs" @refresh="getList" />
     </div>
   </template>
-  
+
   <script>
-  import { 
-    listTableApi, 
-    delTableParamsApi, 
+  import {
+    listTableApi,
+    delTableParamsApi,
     publicByPutApi as releaseApi
     } from "@/api/CURD";
   import addAndEdit from "./formBox/scenicAreaTicketsForm.vue"
@@ -152,7 +152,7 @@
         listTableApi(
           this.configUrl.list,
           this.addDateRange(
-            this.queryParams, 
+            this.queryParams,
             this.dateRange)).then(response => {
               this.tableList = response.data.rows;
               this.total = response.data.total;
@@ -163,7 +163,7 @@
           this.tableList = [];
           this.total = 0;
           this.loading = false
-        }) 
+        })
       },
       /** 搜索按钮操作 */
       handleQuery() {
@@ -262,4 +262,3 @@
     }
   };
   </script>
-