Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/index.vue

@@ -42,6 +42,10 @@ function logout() {
   ElMessage.success("退出成功");
 }
 
+const imgrule1 = '../src/assets/动漫美女.png';
+const list=[
+  '../src/assets/韩信.png'
+];
 // 挂载
 onMounted(async function () {
   // 获取用户信息
@@ -153,11 +157,7 @@ onMounted(async function () {
           >
             <el-sub-menu index="1" class="admin">
               <template #title>
-                <img
-                  style="width: 30px; height: 30px; border-radius: 50%"
-                  src="../assets/金币管理系统logo.png"
-                  alt="出错了"
-                />
+                <el-image :preview-src-list="list" preview-teleported="true" :src="imgrule1" alt="错误" style="width: 50px; height: 50px" />
                 <span style="margin-left: 10px">{{ adminData.name }}</span>
               </template>
               <el-menu-item index="1-1">查看个人信息</el-menu-item>

vue/gold-system/src/views/recharge/adminRecharge.vue

@@ -352,7 +352,7 @@ onMounted(async function () {
                         <el-table-column prop="payWay" label="支付方式" width="100px" />
                         <el-table-column prop="rechargeVoucher" label="支付凭证" width="150px">
                             <template #default="scope">
-                                <el-image :src="scope.row.rechargeVoucher" alt="凭证" style="width: 50px; height: 50px" />
+                                <el-image :preview-src-list="[scope.row.rechargeVoucher]" preview-teleported="true" :src="scope.row.rechargeVoucher" alt="凭证" style="width: 50px; height: 50px" />
                             </template>
                         </el-table-column>
                         <el-table-column prop="name" label="提交人" width="100px" />

vue/gold-system/src/views/recharge/allRecharge.vue

@@ -281,61 +281,31 @@ onMounted(async function () {
   <el-row>
     <el-col>
       <el-card style="margin-bottom: 20px">
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 10px;">
           <el-col :span="8">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">活动名称：</el-text>
-              <el-select
-                v-model="rechargeVo.activityId"
-                placeholder="请选择活动名称"
-                size="large"
-                style="width: 240px"
-                clearable
-              >
-                <el-option
-                  v-for="item in activity"
-                  :key="item.activityId"
-                  :label="item.activityName"
-                  :value="item.activityId"
-                />
+              <el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称" size="large" style="width: 240px"
+                clearable>
+                <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
+                  :value="item.activityId" />
               </el-select>
             </div>
           </el-col>
           <el-col :span="8">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">支付方式：</el-text>
-              <el-select
-                v-model="rechargeVo.payWay"
-                placeholder="请选择支付方式"
-                size="large"
-                style="width: 240px"
-                clearable
-              >
-                <el-option
-                  v-for="item in payWay"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
+              <el-select v-model="rechargeVo.payWay" placeholder="请选择支付方式" size="large" style="width: 240px" clearable>
+                <el-option v-for="item in payWay" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </div>
+
           </el-col>
           <el-col :span="8">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">所属地区：</el-text>
-              <el-select
-                v-model="rechargeVo.area"
-                placeholder="请选择所属地区"
-                size="large"
-                style="width: 240px"
-                clearable
-              >
-                <el-option
-                  v-for="item in area"
-                  :key="item"
-                  :label="item"
-                  :value="item"
-                />
+              <el-select v-model="rechargeVo.area" placeholder="请选择所属地区" size="large" style="width: 240px" clearable>
+                <el-option v-for="item in area" :key="item" :label="item" :value="item" />
               </el-select>
             </div>
           </el-col>
@@ -344,16 +314,9 @@ onMounted(async function () {
           <el-col :span="21">
             <div class="head-card-element">
               <el-text class="mx-1" size="large">充值时间：</el-text>
-              <el-date-picker
-                v-model="getTime"
-                type="datetimerange"
-                range-separator="至"
-                start-placeholder="起始时间"
-                end-placeholder="结束时间"
-              />
-              <el-button style="margin-left: 10px" @click="getToday()"
-                >今</el-button
-              >
+              <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
+                end-placeholder="结束时间" />
+              <el-button style="margin-left: 10px;" @click="getToday()">今</el-button>
               <el-button @click="getYesterday()">昨</el-button>
               <el-button @click="get7Days()">近7天</el-button>
             </div>
@@ -371,12 +334,7 @@ onMounted(async function () {
   <el-row>
     <el-col>
       <el-card>
-        <el-tabs
-          v-model="activeName"
-          type="card"
-          class="demo-tabs"
-          @tab-click="handleClick"
-        >
+        <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
           <el-tab-pane label="全部" name="all"></el-tab-pane>
           <el-tab-pane label="待审核" name="wait"></el-tab-pane>
           <el-tab-pane label="已通过" name="pass"></el-tab-pane>
@@ -387,42 +345,17 @@ onMounted(async function () {
             <el-table-column prop="username" label="姓名" width="100px" />
             <el-table-column prop="jwcode" label="精网号" width="150px" />
             <el-table-column prop="area" label="所属地区" width="100px" />
-            <el-table-column
-              prop="activityName"
-              label="活动名称"
-              width="150px"
-            />
-            <el-table-column
-              prop="rechargeGold"
-              label="充值金额"
-              width="100px"
-            />
-            <el-table-column
-              prop="rechargeWay"
-              label="充值方式"
-              width="100px"
-            />
+            <el-table-column prop="activityName" label="活动名称" width="150px" />
+            <el-table-column prop="rechargeGold" label="充值金额" width="100px" />
+            <el-table-column prop="rechargeWay" label="充值方式" width="100px" />
             <el-table-column prop="paidGold" label="充值金币" width="100px" />
             <el-table-column prop="freeGold" label="免费金币" width="100px" />
-            <el-table-column
-              prop="remark"
-              label="备注"
-              width="200px"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
             <el-table-column prop="payWay" label="支付方式" width="100px" />
-            <el-table-column
-              prop="rechargeVoucher"
-              label="支付凭证"
-              width="150px"
-            >
+            <el-table-column prop="rechargeVoucher" label="支付凭证" width="150px">
               <template #default="scope">
-                <el-image
-                  :src="scope.row.rechargeVoucher"
-                  alt="凭证"
-                  style="width: 50px; height: 50px"
-                  initial-index
-                />
+                <el-image :preview-src-list="[scope.row.rechargeVoucher]" preview-teleported="true"
+                  :src="scope.row.rechargeVoucher" alt="凭证" style="width: 50px; height: 50px" />
               </template>
             </el-table-column>
             <el-table-column prop="name" label="提交人" width="100px" />
@@ -448,17 +381,10 @@ onMounted(async function () {
                 </span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="reson"
-              label="驳回理由"
-              width="200px"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="reson" label="驳回理由" width="200px" show-overflow-tooltip />
             <el-table-column prop="rechargeTime" label="交款时间" width="200px">
               <template #default="scope">
-                {{
-                  moment(scope.row.rechargeTime).format("YYYY-MM-DD HH:mm:ss")
-                }}
+                {{ moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss') }}
               </template>
             </el-table-column>
             <el-table-column prop="createTime" label="提交时间" width="200px" />
@@ -467,48 +393,40 @@ onMounted(async function () {
 
         <!-- 分页 -->
         <div class="pagination">
-          <el-pagination
-            background
-            :page-size="getObj.pageSize"
-            layout="slot"
-            :total="total"
-          >
-            <div>共{{ total }}条,每页</div>
-            <el-select
-              v-model="getObj.pageSize"
-              class="page-size"
-              @change="get()"
-              style="width: 80px"
-            >
-              <el-option
-                v-for="item in [5, 6, 7, 8, 9, 10]"
-                :key="item"
-                :label="item"
-                :value="item"
-              ></el-option>
+          <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
+            <div>共{{ total }}条,每页 </div>
+            <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
+              <el-option v-for="item in [5, 6, 7, 8, 9, 10]" :key="item" :label="item" :value="item"></el-option>
             </el-select>
-            <div>条</div>
+            <div> 条</div>
           </el-pagination>
-          <el-pagination
-            background
-            layout="prev, pager, next,slot"
-            :page-size="getObj.pageSize"
-            :total="total"
-            :current-page="getObj.pageNum"
-            @current-change="get"
-          >
+          <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize" :total="total"
+            :current-page="getObj.pageNum" @current-change="get">
             <div>跳至</div>
-            <el-input
-              v-model="getObj.pageNum"
-              style="width: 40px"
-              @change="checkNumber"
-            />
+            <el-input v-model="getObj.pageNum" style="width: 40px;" @change="checkNumber" />
             <div>页</div>
           </el-pagination>
         </div>
       </el-card>
     </el-col>
   </el-row>
+
+  <!-- 分页 -->
+  <div class="pagination">
+    <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
+      <div>共{{ total }}条,每页</div>
+      <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
+        <el-option v-for="item in [5, 6, 7, 8, 9, 10]" :key="item" :label="item" :value="item"></el-option>
+      </el-select>
+      <div>条</div>
+    </el-pagination>
+    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize" :total="total"
+      :current-page="getObj.pageNum" @current-change="get">
+      <div>跳至</div>
+      <el-input v-model="getObj.pageNum" style="width: 40px" @change="checkNumber" />
+      <div>页</div>
+    </el-pagination>
+  </div>
 </template>
 
 <style scoped>

vue/gold-system/src/views/z.vue

@@ -59,11 +59,14 @@ onMounted(async function () {
     rechargeBar.setOption(option);
 })
 
+const imgrule = ref('..\assets\韩信.png');
 
 </script>
 
 <template>
-    <div>zzz</div>
+    <div>
+        <el-image :preview-src-list="[imgrule]" preview-teleported="true" src="..\assets\动漫美女.png" alt="美女" style="width: 50px; height: 50px" />
+    </div>
     <div id="main" style="width: 600px;height:400px;"></div>
 </template>