Commit df5f3990 authored by zhengke's avatar zhengke

支付优化, 颜色列表优化

parent 2ecb9a50
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<div class="CloudDisk-L"> <div class="CloudDisk-L">
<div class="row CloudDisk-L-inquire"> <div class="row CloudDisk-L-inquire">
<el-input v-model="GName" <el-input v-model="GName"
placeholder="搜索分组名称" @keyup.enter="querySearchGroup"> placeholder="搜索分组名称" @keyup.enter="querySearchGroup"
@change="SearchGroup">
</el-input> </el-input>
<el-button type="primary" @click="addEditGroup">添加</el-button> <el-button type="primary" @click="addEditGroup">添加</el-button>
</div> </div>
...@@ -288,7 +289,9 @@ const deleteGroup = (item:any) => { ...@@ -288,7 +289,9 @@ const deleteGroup = (item:any) => {
} }
const SearchGroup = () => {
if(GName.value=='') querySearchGroup()
}
const querySearchGroup = async () =>{ const querySearchGroup = async () =>{
try { try {
let datasRes = await CloudDiskService.GetPPTCloudList(GName.value); let datasRes = await CloudDiskService.GetPPTCloudList(GName.value);
......
...@@ -169,12 +169,13 @@ ...@@ -169,12 +169,13 @@
size="small">广告</el-tag> size="small">广告</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="创建人/时间" width="150"> <el-table-column label="修改时间" width="150">
<template #default="scope"> <template #default="scope">
{{scope.row.CreateByName}}<br/> <!-- {{scope.row.CreateByName}}<br/> -->
<span class="text-info">{{scope.row.CreateTime}}</span> <!-- <span class="text-info">{{scope.row.CreateTime}}</span> -->
<span class="text-info">{{scope.row.UpdateTime}}</span>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
<template #default="scope"> <template #default="scope">
<el-button type="default" link :icon="Edit" size="small" @click="goToTemplate(scope.row)">编辑</el-button> <el-button type="default" link :icon="Edit" size="small" @click="goToTemplate(scope.row)">编辑</el-button>
......
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
:selectable="selectable" :reserve-selection="true"/> :selectable="selectable" :reserve-selection="true"/>
<el-table-column label="颜色分类"> <el-table-column label="颜色分类">
<template #default="scope"> <template #default="scope">
<span v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></span> <span v-if="!scope.row.Code" v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="颜色名称"> <el-table-column label="颜色名称">
<template #default="scope"> <template #default="scope">
<div v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></div> <div v-if="scope.row.Code" v-html="queryObj.Name!=''&&scope.row.Name?(scope.row.Name.replaceAll(queryObj.Name,`<span class='text-waring'>${queryObj.Name}</span>`)):scope.row.Name"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="色值"> <el-table-column label="色值">
......
...@@ -197,10 +197,10 @@ const setPaymentQrCode = async ()=>{ ...@@ -197,10 +197,10 @@ const setPaymentQrCode = async ()=>{
} }
const response = await OrderService.CreateTempOrderPaymentAsync(parameters) const response = await OrderService.CreateTempOrderPaymentAsync(parameters)
if(response.data.resultCode==ApiResult.SUCCESS){ if(response.data.resultCode==ApiResult.SUCCESS){
beginTimerHandler()
qrCode.value = response.data.data.qr qrCode.value = response.data.data.qr
orderNum.value = response.data.data.no orderNum.value = response.data.data.no
countValue.value = Date.now() + 1000 * 60 * 30 countValue.value = Date.now() + 1000 * 60 * 30
beginTimerHandler()
}else{ }else{
qrCode.value='none' qrCode.value='none'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment