add

src/views/store/storeProduct/index.vue

@@ -99,7 +99,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['store:storePayment:export']"
+          v-hasPermi="['store:storeProduct:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -109,7 +109,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="putOn"
-          v-hasPermi="['store:storePayment:pullOff']"
+          v-hasPermi="['store:storeProduct:putOn']"
         >上架</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -119,7 +119,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="pullOff"
-          v-hasPermi="['store:storePayment:pullOff']"
+          v-hasPermi="['store:storeProduct:pullOff']"
         >下架</el-button>
       </el-col>
 	    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/store/user/index.vue

@@ -125,6 +125,8 @@
               <el-tag prop="status" v-for="(item, index) in userIsPromoterOptions"    v-if="scope.row.isPromoter==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
+      <el-table-column label="推广员手机号码" align="center" prop="spreadPhone" />
+      
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>

src/views/store/userExtract/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      
+
       <el-form-item label="会员昵称" prop="nickname">
         <el-input
-          
+
           v-model="queryParams.nickname"
           placeholder="请输入会员昵称"
           clearable
@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="手机号码" prop="phone">
         <el-input
-         
+
           v-model="queryParams.phone"
           placeholder="请输入手机号码"
           clearable
@@ -46,7 +46,7 @@
       </el-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -57,7 +57,7 @@
         >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
+    </el-row>
 
     <el-table  height="500" border v-loading="loading" :data="userExtractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -65,11 +65,12 @@
       <el-table-column label="会员昵称" align="center" prop="nickname" />
       <el-table-column label="会员手机号" align="center" prop="phone" />
       <el-table-column label="提现类型" align="center" prop="extractType" />
-      <!-- <el-table-column label="银行卡" align="center" prop="bankCode" />
-      <el-table-column label="开户地址" align="center" prop="bankAddress" />
-      <el-table-column label="支付宝账号" align="center" prop="alipayCode" /> -->
+
+<!--      <el-table-column label="支付宝账号" align="center" prop="alipayCode" /> -->
       <el-table-column label="提现金额" align="center" prop="extractPrice" />
       <el-table-column label="余额" align="center" prop="balance" />
+      <el-table-column label="银行卡" align="center" prop="bankCode" />
+      <el-table-column label="开户地址" align="center" prop="bankAddress" />
       <el-table-column label="审核原因" align="center" prop="failMsg" />
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
@@ -91,7 +92,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -103,18 +104,18 @@
     <!-- 添加或修改用户提现对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-  
+
         <el-form-item label="会员昵称" prop="nickname">
           <el-input v-model="form.nickname" disabled   />
         </el-form-item>
         <el-form-item label="会员手机号" prop="phone">
           <el-input v-model="form.phone" disabled />
         </el-form-item>
-        
+
         <el-form-item label="提现金额" prop="extractPrice">
           <el-input v-model="form.extractPrice" disabled placeholder="请输入提现金额" />
         </el-form-item>
-       
+
         <el-form-item label="余额" prop="balance">
           <el-input v-model="form.balance" disabled placeholder="请输入提现金额" />
         </el-form-item>
@@ -127,8 +128,8 @@
         <el-form-item label="审核原因" v-if="form.status==-1" prop="failMsg">
           <el-input type="textarea" :row="5" v-model="form.failMsg" placeholder="请输入审核原因" />
         </el-form-item>
-      
-       
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/system/config/config.vue

@@ -45,6 +45,22 @@
                 <el-input-number  v-model="form1.storeAfterSalesDay" :min="0" :max="100"    ></el-input-number>
               </el-tooltip>
             </el-form-item>
+            <el-form-item label="视频地址" prop="videoUrl">
+             <div>
+                 <el-upload
+                   ref="upload"
+                   class="upload-demo"
+                   :action="uploadUrl"
+                   :on-success="handleSuccess"
+                   :before-upload="beforeUpload"
+                   :limit="1"
+                   :accept="videoAccept"
+                 >
+                <el-button size="small" type="primary">点击上传视频</el-button>
+                </el-upload>
+                <video v-if="form1.videoUrl" :src="form1.videoUrl" controls style="max-width: 400px; max-height: 400px;"></video>
+             </div>
+            </el-form-item>
             <el-form-item  label="退货收货人" prop="refundConsignee">
               <el-tooltip class="item" effect="dark" content="退货收货人" placement="top-end">
                 <el-input style="width:200px"  v-model="form1.refundConsignee"   ></el-input>
@@ -248,6 +264,8 @@ export default {
       signform: {
 
       },
+      uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
+      videoAccept:"video/*",
       photoArr:[],
       activeName:"store.config",
       configId:null,
@@ -297,6 +315,30 @@ export default {
     this.getConfigByKey(this.activeName);
   },
   methods: {
+      handleSuccess(response, file) {
+            // 上传成功后的回调函数
+            this.myloading.close();
+            this.form1.videoUrl = response.url;
+            this.$refs.upload.clearFiles();
+          },
+      beforeUpload(file) {
+        // 上传前的钩子函数，可以在这里对文件进行处理
+        // 返回 false 则取消上传
+
+        // 例如限制文件大小
+        const isLt2M = file.size / 1024 / 1024 < 200;
+        if (!isLt2M) {
+          this.$message.error('上传视频文件大小不能超过 200MB!');
+          return false;
+        }
+        this.myloading = this.$loading({
+          lock: true,
+          text: '上传中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+
+      },
       handleSignEdit(item){
         this.signform=item;
         this.sign.open=true;