更换项目地址

src/layout/components/Navbar.vue

@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融惠享管理平台</p>
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>惠享管理平台</p>
-     <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
+     <!-- <h3 class="breadcrumb-container">银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
        <!-- <p>欢迎您，{{name}}</p>
         <p class="dy" @click="logout()"><img src="@/assets/images/dy.png"></p> -->
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融惠享管理平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 惠享管理平台 All Rights Reserved</el-footer>
   </div>
 </template>
 

src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融惠享',
+  title: '惠享',
 
   /**
    * @type {boolean} true | false

src/views/commodity/commodityAdd.vue

@@ -67,12 +67,11 @@
                 <div class="item">
                     <span class="item_text">规格 (斤/份)：</span>
                     <el-input v-model="formobj.weight" placeholder="例如：30" class="item_input" clearable
-						oninput="value=value.replace(/[^0-9]/g,'')" />
+                        oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
                 </div>
                 <div class="item">
                     <span class="item_text">规格单位：</span>
-					<el-input v-model="formobj.unitName" placeholder="例如：份" :readonly="true" class="item_input"
+                    <el-input v-model="formobj.unitName" placeholder="例如：份" class="item_input" clearable />
-						clearable />
                 </div>
                 <div class="item">
                     <span class="item_text">规格描述：</span>
@@ -88,6 +87,11 @@
                     <span class="item_text">商品简介：</span>
                     <el-input v-model="formobj.content" placeholder="商品简介" class="item_input" clearable />
                 </div>
+                <div class="item">
+                    <span class="item_text">商品排序：</span>
+                    <el-input v-model="formobj.sort" placeholder="商品排序" class="item_input" clearable
+                        oninput="value=value.replace(/[^0-9]/g,'')" />
+                </div>
 
                 <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
                     <span class="item_text">图片：</span>
@@ -138,10 +142,11 @@
                     weight: '',
                     remarks: '',
                     content: '',
+                    sort: '',
                     picUrl: '',
-					brandId: null,
+                    brandId: '',
                     brandName: '',
-					categoryId: null,
+                    categoryId: '',
                     categoryName: '',
                     periodValidity: ""
                 },
@@ -210,6 +215,7 @@
                     weight: '',
                     remarks: '',
                     content: '',
+                    sort: '',
                     picUrl: '',
                     appContent: '',
                     periodValidity: ""

src/views/commodity/index.vue

@@ -15,18 +15,10 @@
 
                         </el-form>
                         <div class="btn" style="text-align: center;">
-              <el-button
+                            <el-button type="primary" size="small" icon="el-icon-search"
-                type="primary"
+                                @click="dosearch">查询</el-button>
-                size="small"
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
-                icon="el-icon-search"
+                                @click="resetQuery">重置</el-button>
-                @click="dosearch"
-              >查询</el-button>
-              <el-button
-                type="primary"
-                size="small"
-                icon="el-icon-refresh"
-                @click="resetQuery"
-              >重置</el-button>
                         </div>
                     </div>
                 </div>
@@ -48,26 +40,15 @@
                         </el-table-column>
                         <el-table-column label="小程序自选商品" align="center" width="140">
                             <template slot-scope="scope">
-                <el-switch
+                                <el-switch v-model="scope.row.useTo" active-text="是" inactive-text="否" active-value="1"
-                  v-model="scope.row.useTo"
+                                    inactive-value="2" @change="enableChange1(scope.row.sid,scope.row.useTo)" />
-                  active-text="是"
-                  inactive-text="否"
-                  active-value="1"
-                  inactive-value="2"
-                  @change="enableChange1(scope.row.sid,scope.row.useTo)"
-                />
                             </template>
                         </el-table-column>
                         <el-table-column label="商品上架" align="center" width="140">
                             <template slot-scope="scope">
-                <el-switch
+                                <el-switch v-model="scope.row.isAppletGrounding" active-text="上架" inactive-text="下架"
-                  v-model="scope.row.isAppletGrounding"
+                                    active-value="1" inactive-value="2"
-                  active-text="上架"
+                                    @change="enableChange2(scope.row.sid,scope.row.isAppletGrounding)" />
-                  inactive-text="下架"
-                  active-value="1"
-                  inactive-value="2"
-                  @change="enableChange2(scope.row.sid,scope.row.isAppletGrounding)"
-                />
                             </template>
                         </el-table-column>
                         <el-table-column prop="name" label="商品名称" align="center" />
@@ -75,12 +56,8 @@
                             <template slot-scope="scope">
                                 <el-popover placement="left" trigger="click" width="300">
                                     <img :src="scope.row.picUrl" width="100%">
-                  <img
+                                    <img slot="reference" :src="scope.row.picUrl" :alt="scope.row.picUrl"
-                    slot="reference"
+                                        style="max-height: 70px;max-width: 70px; padding: 5px">
-                    :src="scope.row.picUrl"
-                    :alt="scope.row.picUrl"
-                    style="max-height: 70px;max-width: 70px; padding: 5px"
-                  >
                                 </el-popover>
                                 <!-- <span v-for="(item,index) in scope.row.picUrl" :key="index">
 						      <el-popover placement="left" trigger="click" width="300">
@@ -95,20 +72,18 @@
                         <el-table-column prop="barcode" label="商品条码" align="center" />
                         <el-table-column prop="price" label="单价" align="center" />
                         <el-table-column prop="unitName" label="标准单位" align="center" />
+                        <el-table-column prop="brandName" label="所属菜窖" align="center" />
+                        <el-table-column prop="categoryName" label="所属分类" align="center" />
+                        <el-table-column prop="sort" label="排序" align="center" />
+                        <el-table-column prop="createTime" label="创建日期" align="center" />
                     </el-table>
                 </div>
                 <!-- End 项目列表 -->
                 <div class="pages">
                     <div class="tit" />
                     <!--  翻页  -->
-          <pagination
+                    <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            v-show="dataList.length > 0"
+                        :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
-            :total="queryParams.total"
-            :page.sync="queryParams.current"
-            :limit.sync="queryParams.size"
-            class="pagination"
-            @pagination="loadList"
-          />
                 </div>
             </div>
         </div>

src/views/invoiceReview/index.vue

@@ -68,7 +68,7 @@
         <!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
 
         <el-dialog title="审核发票" :visible.sync="dialogVisible" :before-close="handleClose">
-			<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;":model="itemInfo">
+            <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="itemInfo">
 
                 <el-row class="first_row">
                     <el-col :span="4" class="trightb">
@@ -138,16 +138,15 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
                 <el-row>
                     <el-col :span="4" class="trightb">
                         <el-form-item class="trightb_item">
-							<span slot="label">企业地址</span>
+                            <span slot="label">电子邮箱</span>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.enterpriseAddress}}</span>
+                            <span slot="label">{{itemInfo.email}}</span>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4" class="trightb">
@@ -161,6 +160,19 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">企业地址</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="20">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.enterpriseAddress}}</span>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
                 <el-row>
                     <el-col :span="4" class="trightb">
                         <el-form-item class="trightb_item">

src/views/login/login.vue

@@ -2,8 +2,8 @@
   <div class="login">
     <div class="logoTitle" style="margin-left: 50px;margin-top: 50px;">
      <!-- <img src="../../assets/loginImg/shgf.png"
-        style="width: 50px;height: 50px; margin-right: 10px;" /><span>汇融惠享</span>
+        style="width: 50px;height: 50px; margin-right: 10px;" /><span>惠享</span>
-      <p class="title" style="margin-top: 5px;">汇融惠享管理平台</p> -->
+      <p class="title" style="margin-top: 5px;">惠享管理平台</p> -->
     </div>
     <div class="main">
       <div class="content">

src/views/print/index - 副本.vue

@@ -63,7 +63,7 @@
 							fontWeight: 400,
 							x: 88,
 							y: 3,
-							default: '汇融惠享礼包卡',
+							default: '惠享礼包卡',
 							fontSize: '5', // 字体大小
 							fontFamily: '微软雅黑', // 字体类型   默认 '微软雅黑'
 							fontWeight: null, // 字体宽度