Explorar o código

修改支持手机端显示

Seven hai 5 meses
pai
achega
81731f77c8

+ 64 - 62
merchant-ui/src/views/order/index.vue

@@ -324,67 +324,69 @@ onMounted(() => {
 </script>
 
 <template>
-  <div>
-    <el-card>
-      <form-search
-        :show="pageData.searchParam.searchState"
-        :form-field="searchFormFields"
-        :data-source="pageData.dataSource"
-        :query-permission="pageData.permission.query"
-        @search-form="_updateSearchFormData"
-        @search="_searchForm"
-        @reset="_resetSearchForm"
-      />
-      <!--operate-->
-      <table-buttons
-        :size="pageData.btnOpts.size"
-        :left-btns="pageData.btnOpts.leftBtns"
-        :right-btns="pageData.btnOpts.rightBtns"
-        @click="btnClickHandle"
-      />
-      <!--table-->
-      <pure-table
-        :data="pageData.tableParam.list"
-        :columns="pageData.tableParam.columns"
-        row-key="id"
-        border
-        stripe
-        :header-row-class-name="'table-header'"
-        :loading="pageData.tableParam.loading"
-        :pagination="pageData.tableParam.pagination"
-        @page-current-change="handleChangeCurrentPage"
-        @page-size-change="handleChangePageSize"
-      >
+  <el-card :shadow="'never'">
+    <template #default>
+      <div>
+          <form-search
+            :show="pageData.searchParam.searchState"
+            :form-field="searchFormFields"
+            :data-source="pageData.dataSource"
+            :query-permission="pageData.permission.query"
+            @search-form="_updateSearchFormData"
+            @search="_searchForm"
+            @reset="_resetSearchForm"
+          />
+          <!--operate-->
+          <table-buttons
+            :size="pageData.btnOpts.size"
+            :left-btns="pageData.btnOpts.leftBtns"
+            :right-btns="pageData.btnOpts.rightBtns"
+            @click="btnClickHandle"
+          />
+          <!--table-->
+          <pure-table
+            :data="pageData.tableParam.list"
+            :columns="pageData.tableParam.columns"
+            row-key="id"
+            border
+            stripe
+            :header-row-class-name="'table-header'"
+            :loading="pageData.tableParam.loading"
+            :pagination="pageData.tableParam.pagination"
+            @page-current-change="handleChangeCurrentPage"
+            @page-size-change="handleChangePageSize"
+          >
 
-        <template #ellipsis="{ row, column }">
-          <el-tooltip placement="top-start" :content="row[column.property]"
-          >{{ row[column.property] }}
-          </el-tooltip>
-        </template>
-        <template #enableOptions="scope">
-          <el-tag type="danger" v-if="scope.row.status==-1">支付失败</el-tag>
-          <el-tag v-if="scope.row.status==0">待支付</el-tag>
-          <el-tag type="success" v-if="scope.row.status==1">支付成功</el-tag>
-          <el-tag type="warning" v-if="scope.row.status==2">退款</el-tag>
-        </template>
-        <template #operation="{ row }">
-          <div class="flex justify-center items-center">
-            <el-link
-              type="primary"
-              v-if="row.status!=1"
-              @click="handlePayStatus(row)"
-            >查询支付状态
-            </el-link>
-            <el-link
-              type="primary"
-              v-if="row.status==1"
-              @click="handleCallback(row)"
-            >回调
-            </el-link>
-          </div>
-        </template>
-      </pure-table>
-      <edit ref="editRef" @ok="_loadData" />
-    </el-card>
-  </div>
+            <template #ellipsis="{ row, column }">
+              <el-tooltip placement="top-start" :content="row[column.property]"
+              >{{ row[column.property] }}
+              </el-tooltip>
+            </template>
+            <template #enableOptions="scope">
+              <el-tag type="danger" v-if="scope.row.status==-1">支付失败</el-tag>
+              <el-tag v-if="scope.row.status==0">待支付</el-tag>
+              <el-tag type="success" v-if="scope.row.status==1">支付成功</el-tag>
+              <el-tag type="warning" v-if="scope.row.status==2">退款</el-tag>
+            </template>
+            <template #operation="{ row }">
+              <div class="flex justify-center items-center">
+                <el-link
+                  type="primary"
+                  v-if="row.status!=1"
+                  @click="handlePayStatus(row)"
+                >查询支付状态
+                </el-link>
+                <el-link
+                  type="primary"
+                  v-if="row.status==1"
+                  @click="handleCallback(row)"
+                >回调
+                </el-link>
+              </div>
+            </template>
+          </pure-table>
+          <edit ref="editRef" @ok="_loadData" />
+      </div>
+    </template>
+  </el-card>
 </template>

+ 13 - 7
merchant-ui/src/views/paytest/index.vue

@@ -91,7 +91,7 @@ onMounted(() => {
 </script>
 <template>
   <div>
-    <el-card class="min-w-[800px]" style="border-radius: 8px" shadow="hover">
+    <el-card style="border-radius: 8px" shadow="hover">
       <template #header>
         <el-text class="mx-1" type="primary" size="large">支付信息</el-text>
       </template>
@@ -117,12 +117,18 @@ onMounted(() => {
             </el-select>
           </el-form-item>
           <el-form-item label="业务单号">
-            <el-input style="width: 200px"
-                      v-model="pageData.formData.bizOrderNo"
-                      clearable
-                      placeholder="请输入业务单号"
-            />
-            <el-button type="primary" class="ml-3" style="height: 25px" @click="genbizOrderNoeNo">生成</el-button>
+            <el-row :gutter="10">
+              <el-col :span="16">
+                <el-input
+                    v-model="pageData.formData.bizOrderNo"
+                    clearable
+                    placeholder="请输入业务单号"
+                />
+              </el-col>
+              <el-col :span="8">
+                <el-button type="primary" class="ml-3" style="height: 25px" @click="genbizOrderNoeNo">生成</el-button>
+              </el-col>
+            </el-row>
           </el-form-item>
           <el-form-item label="支付标题">
             <el-input

+ 2 - 3
merchant-ui/src/views/paytest/modules/edit.vue

@@ -44,9 +44,8 @@ defineExpose({ open });
 
 <template>
   <el-dialog v-model="pageData.dialogVisible" title="扫码支付" destroy-on-close :width="500">
-
-      <a :href="pageData.formData.qrCode"  target="_blank">{{ pageData.formData.qrCode }}</a>
-    <img :src="pageData.formData.imageBase64" />
+    <a :href="pageData.formData.qrCode" target="_blank">{{ pageData.formData.qrCode }}</a>
+    <img :src="pageData.formData.imageBase64" alt="pageData.formData.qrCode"/>
     <el-text>请使用支付宝"扫一扫"进行支付</el-text>
   </el-dialog>
 </template>