Browse Source

接口优化

yuwenjun1997 2 years ago
parent
commit
4237d8b476

+ 1 - 1
src/views/common/helper/document/index.vue

@@ -45,7 +45,7 @@
       <el-table-column label="操作" align="center" width="240px">
         <template slot-scope="{ row }">
           <el-button v-if="userIdentity === 1" type="primary" size="mini" @click="handleEditFile(row)">编辑</el-button>
-          <el-button type="success" size="mini" @click="handlePreview(row)">查看</el-button>
+          <el-button type="primary" size="mini" @click="handlePreview(row)">查看</el-button>
           <el-button v-if="userIdentity === 1" type="danger" size="mini" @click="handleRemove(row)">删除</el-button>
         </template>
       </el-table-column>

+ 1 - 1
src/views/common/helper/video/index.vue

@@ -49,7 +49,7 @@
       <el-table-column label="操作" align="center" width="240px">
         <template slot-scope="{ row }">
           <el-button v-if="userIdentity === 1" type="primary" size="mini" @click="handleEditFile(row)">编辑</el-button>
-          <el-button type="success" size="mini" @click="handlePreview(row)">播放</el-button>
+          <el-button type="primary" size="mini" @click="handlePreview(row)">播放</el-button>
           <el-button v-if="userIdentity === 1" type="danger" size="mini" @click="handleRemove(row)">删除</el-button>
         </template>
       </el-table-column>

+ 5 - 11
src/views/common/share/pay/pay.vue

@@ -31,6 +31,7 @@
         请选择以下一家银行进行付款<span>(请在倒计时时间内使用</span><i>企业网银</i><span>完成本次支付)</span>
       </div>
       <pay-bank
+        ref="payBank"
         :data="orderInfo"
         :show-price="false"
         :copy-status="false"
@@ -94,8 +95,6 @@ export default {
     },
     // 确认支付
     handleBankChange(e) {
-      console.log(e)
-      console.log(e)
       this.submitInfo = e
     },
     // 获取订单信息
@@ -113,9 +112,10 @@ export default {
       this.redirectUrlQuery = {
         payAmount: e.data.payAmount
       }
-      checkedUnionPaySuccess({ mbOrderId: e.data.mbOrderId }).then((res) => {
+      checkedUnionPaySuccess({ mbOrderId: e.data.mbOrderId, orderFlag: 0 }).then((res) => {
         res = JSON.parse(res.data)
-        if (res.data.status === '1') {
+        console.log(res)
+        if (res.rt10_orderStatus.toLocaleLowerCase() === 'success') {
           this.$router.push({
             path: '/share/pay-success',
             query: this.redirectUrlQuery
@@ -130,13 +130,7 @@ export default {
     },
     // 跳转支付
     onSubmit() {
-      if (this.submitInfo.data && this.submitInfo.data.payUrl) {
-        this.confirmVisiable = true
-        window.open(this.submitInfo.data.payUrl, '_blank')
-      } else {
-        this.$message.warning('请选择银行')
-        return
-      }
+      this.$refs.payBank.onSubmit()
     },
     // 倒计时
     countDown() {

+ 1 - 1
src/views/normal/club/index.vue

@@ -85,7 +85,7 @@
       </el-table-column>
 
       <el-table-column label="创建人" class-name="status-col" width="180px" prop="createBy" />
-      <el-table-column label="操作" align="center" width="500px" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="430px" class-name="small-padding fixed-width">
         <template slot-scope="{ row }">
           <permission-button type="primary" size="mini" @click="$_navigationTo(`club-edit?type=edit&id=${row.authId}`)">
             编辑

+ 2 - 1
src/views/normal/material/article/index.vue

@@ -46,6 +46,7 @@
       <el-table-column label="文章头图" width="100px" align="center">
         <template slot-scope="{ row }">
           <el-image
+            v-if="row.articleImage"
             style="width: 50px; height: 50px"
             :src="row.articleImage"
           /></template>
@@ -65,7 +66,7 @@
             </template>
             <template v-else>
               <span style="margin-right: 10px" class="status success">已上线</span>
-              <permission-button type="info" size="mini" plain @click="handleChangeStatus(row)">下线</permission-button>
+              <permission-button type="info" size="mini" @click="handleChangeStatus(row)">下线</permission-button>
             </template>
           </template>
           <template v-else>

+ 1 - 1
src/views/normal/material/file/index.vue

@@ -58,7 +58,7 @@
             </template>
             <template v-else>
               <span style="margin-right: 10px" class="status success">已上线</span>
-              <permission-button type="info" size="mini" plain @click="handleChangeStatus(row)">下线</permission-button>
+              <permission-button type="info" size="mini" @click="handleChangeStatus(row)">下线</permission-button>
             </template>
           </template>
           <template v-else>

+ 1 - 1
src/views/normal/material/image/index.vue

@@ -58,7 +58,7 @@
             </template>
             <template v-else>
               <span style="margin-right: 10px" class="status success">已上线</span>
-              <permission-button type="info" size="mini" plain @click="handleChangeStatus(row)">下线</permission-button>
+              <permission-button type="info" size="mini" @click="handleChangeStatus(row)">下线</permission-button>
             </template>
           </template>
           <template v-else>

+ 1 - 1
src/views/normal/material/package/index.vue

@@ -58,7 +58,7 @@
             </template>
             <template v-else>
               <span style="margin-right: 10px" class="status success">已上线</span>
-              <permission-button type="info" size="mini" plain @click="handleChangeStatus(row)">下线</permission-button>
+              <permission-button type="info" size="mini" @click="handleChangeStatus(row)">下线</permission-button>
             </template>
           </template>
           <template v-else>

+ 1 - 1
src/views/normal/material/video/index.vue

@@ -58,7 +58,7 @@
             </template>
             <template v-else>
               <span style="margin-right: 10px" class="status success">已上线</span>
-              <permission-button type="info" size="mini" plain @click="handleChangeStatus(row)">下线</permission-button>
+              <permission-button type="info" size="mini" @click="handleChangeStatus(row)">下线</permission-button>
             </template>
           </template>
           <template v-else>