Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

.env

@@ -39,7 +39,7 @@ VITE_VERIFY_IMAGE_ENABLE = false
 VITE_WEBSOCKET_ENABLE = false
 
 # 是否开启注册
-VITE_REGISTER_ENABLE  = true
+VITE_REGISTER_ENABLE  = false
 
 # 是否开启租户自动选择 （根据租户域名）
 VITE_AUTO_TENANT = false

src/api/wallet/wallet-code-use.ts

@@ -0,0 +1,9 @@
+import request from "/@/utils/request"
+
+export function codeList(query?: Object) {
+    return request({
+      url: '/wallet/wallet-code-use/code-list',
+      method: 'get',
+      params: query
+    })
+  }

src/api/wallet/wallet-stride.ts

@@ -1,13 +1,5 @@
 import request from "/@/utils/request"
 
-export function codeList(query?: Object) {
-  return request({
-    url: '/wallet/wallet-stride/code-list',
-    method: 'get',
-    params: query
-  })
-}
-
 export function pageJoin(query?: Object) {
   return request({
     url: '/wallet/wallet-stride/page-join',

src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue

@@ -36,13 +36,13 @@
 				</el-col>
 
 				<el-col :span="12" class="mb20">
-					<el-form-item label="进价/单位分" prop="purchasePrice">
+					<el-form-item label="进价" prop="purchasePrice">
 						<el-input-number v-model="form.purchasePrice" placeholder="请输入进价" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="12" class="mb20">
-					<el-form-item label="零售价/单位分" prop="retailPrice">
+					<el-form-item label="零售价" prop="retailPrice">
 						<el-input-number v-model="form.retailPrice" placeholder="请输入零售价" />
 					</el-form-item>
 				</el-col>

src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue

@@ -66,9 +66,10 @@
 						<el-tag v-if="scope.row.status == 1" type="danger">停销</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="purchasePrice" label="进价/单位分" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="retailPrice" label="零售价/单位分" show-overflow-tooltip min-width="120" />
+				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip />
+				<el-table-column prop="purchasePrice" label="进价" show-overflow-tooltip />
+				<el-table-column prop="retailPrice" label="零售价" show-overflow-tooltip />
+				<!-- <el-table-column prop="spuId" label="spuId" show-overflow-tooltip /> -->
 				<el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip />
 				<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
 				<el-table-column label="操作" width="150" fixed="right">

src/views/wallet/components/code-use-table.vue

@@ -19,6 +19,11 @@
             :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle">
             <el-table-column type="index" label="#" width="100" />
             <el-table-column prop="username" label="申请人" />
+            <el-table-column prop="code" label="申请人" >
+                <template #default="{ row }">
+                    <preview-image :src="row.code" />
+                </template>
+            </el-table-column>
             <el-table-column prop="status" label="是否使用">
                 <template #default="{ row }">
                     <dict-tag :options="yes_no_type" :value="row.status" />
@@ -37,14 +42,13 @@
 
 <script setup lang="ts" name="code-use-table">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { codeList } from "/@/api/wallet/wallet-stride";
+import { codeList } from "/@/api/wallet/wallet-code-use";
 import { useDict } from '/@/hooks/dict';
 // 定义变量内容
 const visible = ref(false)
-const loading = ref(false)
 const queryRef = ref()
 // 定义查询字典
-const { check_status, yes_no_type } = useDict('check_status', 'yes_no_type');
+const {  yes_no_type } = useDict('check_status', 'yes_no_type');
 const state: BasicTableProps = reactive<BasicTableProps>({
     queryForm: {},
     pageList: codeList
@@ -54,10 +58,10 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do
 // 打开弹窗
 const openDialog = (id: string) => {
     visible.value = true
-    state.queryForm.id = ''
+    state.queryForm.bizId = ''
     // 获取walletStride信息
     if (id) {
-        state.queryForm.id = id
+        state.queryForm.bizId = id
         getDataList()
     }
 };