chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
墨大叔 2024-09-29 18:34:45 +08:00
parent 5a47e4bcb2
commit 33cb4c8623
5 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/system/device/detail.vue
View File

@ -35,8 +35,8 @@
<el-descriptions-item label="设备状态">
<dict-tag :options="dict.type.sm_device_status" :value="deviceData.status" size="mini"/>
</el-descriptions-item>
<el-descriptions-item label="设备到期时间">{{deviceData.rentTime | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="型号">{{deviceData.model | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="产品ID">{{deviceData.productId | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="型号功能" :span="2">
<dict-tag :options="dict.type.sm_model_tag" :value="deviceData.modelTags" size="mini"/>
</el-descriptions-item>
@ -93,7 +93,8 @@
<store-link :name="deviceData.storeName" :id="deviceData.storeId"/>
</el-descriptions-item>
<el-descriptions-item label="月费">
{{deviceData.monthFee | money | defaultValue}} %
{{deviceData.monthFee | money | defaultValue}} 元 / 月
（到期时间：{{deviceData.rentTime | defaultValue}}）
</el-descriptions-item>
<el-descriptions-item label="平台服务费" v-if="deviceData.serviceMode === DeviceServiceMode.DIRECT">
{{deviceData.realServiceRate | money | defaultValue}} %

12
src/views/system/device/index.vue
View File

@ -189,6 +189,11 @@
<dict-tag :options="dict.type.sm_device_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="服务模式" align="center" prop="serviceMode">
<template slot-scope="d">
<dict-tag :options="dict.type.device_service_mode" :value="d.row.serviceMode"/>
</template>
</el-table-column>
<el-table-column label="所属用户" align="center" prop="userName" v-if="notHasView(views.user)">
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/>
</el-table-column>
@ -198,15 +203,10 @@
<el-table-column label="所属代理" align="center" prop="agentName" >
<user-link slot-scope="d" :id="d.row.agentId" :name="d.row.agentName"/>
</el-table-column>
<el-table-column label="服务模式" align="center" prop="serviceMode">
<template slot-scope="d">
<dict-tag :options="dict.type.device_service_mode" :value="d.row.serviceMode"/>
</template>
</el-table-column>
<el-table-column label="服务费" align="center" prop="serviceRate" width="180">
<template slot-scope="d">
<template v-if="d.row.monthFee">
月费：{{d.row.monthFee | money | defaultValue}} 元/月 <br/>
月费：{{d.row.monthFee | money | defaultValue}} 元 / 月 <br/>
</template>
<template v-if="d.row.serviceMode === DeviceServiceMode.DIRECT">
平台服务费：{{d.row.realServiceRate | money | defaultValue}} % <br/>

30
src/views/system/model/index.vue
View File

@ -34,17 +34,6 @@
v-hasPermi="['system:model:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:model:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@ -71,10 +60,11 @@
<el-table v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="型号id" align="center" prop="modelId" width="100"/>
<el-table-column label="型号名称" align="center" prop="modelName" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="型号标签" align="center" prop="tags">
<el-table-column label="ID" align="center" prop="modelId" width="80"/>
<el-table-column label="名称" align="center" prop="modelName" />
<el-table-column label="型号编码" align="center" prop="model" />
<el-table-column label="产品ID" align="center" prop="productId" />
<el-table-column label="型号功能" align="center" prop="tags" width="300">
<dict-tag slot-scope="d" :value="d.row.tags" :options="dict.type.sm_model_tag"/>
</el-table-column>
<el-table-column label="图片" align="center" prop="picture" width="100">
@ -82,8 +72,8 @@
<image-preview :src="scope.row.picture" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="产品介绍" align="center" prop="introduce" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="产品介绍" align="center" prop="introduce" width="300"/>
<el-table-column label="备注" align="center" prop="remark" width="300"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -119,11 +109,11 @@
<form-col :span="span" label="图片" prop="picture">
<image-upload v-model="form.picture" :limit="1"/>
</form-col>
<form-col :span="span" label="型号名称" prop="modelName">
<form-col :span="span" label="名称" prop="modelName">
<el-input v-model="form.modelName" placeholder="请输入型号名称" />
</form-col>
<form-col :span="span" label="型号" prop="model">
<el-input v-model="form.model" placeholder="请输入型号"/>
<form-col :span="span" label="型号编码" prop="model">
<el-input v-model="form.model" placeholder="请输入型号编码"/>
</form-col>
<form-col :span="span" label="产品ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入OneNet产品ID"/>

12
src/views/system/recharge/detail.vue
View File

@ -114,15 +114,13 @@
</el-descriptions-item>
<el-descriptions-item label="支付时间">{{detail.payTime | defaultValue}}</el-descriptions-item>
</el-descriptions>
</el-card>
<el-descriptions title="代理信息" :column="1" v-if="DeviceServiceMode.AGENT === detail.deviceServiceMode">
<el-descriptions-item label="代理商">
<user-link :id="detail.agentName" :name="detail.agentId"/>
<el-card class="box-card">
<el-descriptions title="收款方信息" :column="1">
<el-descriptions-item label="代理商" v-if="DeviceServiceMode.AGENT === detail.deviceServiceMode">
<user-link :id="detail.agentId" :name="detail.agentMobile"/>
</el-descriptions-item>
<el-descriptions-item label="代理商手机号">{{detail.agentMobile | defaultValue}}</el-descriptions-item>
</el-descriptions>
<el-descriptions title="商户信息" :column="1">
<el-descriptions-item label="商户">
<user-link :id="detail.mchId" :name="detail.mchName"/>
</el-descriptions-item>

5
src/views/system/smUser/detail.vue
View File

@ -28,6 +28,9 @@
<el-descriptions-item label="充值服务费">
{{userData.realServiceRate | money | defaultValue}} %
</el-descriptions-item>
<el-descriptions-item label="代理服务费">
{{userData.agentServiceRate | money | defaultValue}} %
</el-descriptions-item>
<el-descriptions-item label="提现服务费">
<template v-if="userData.withdrawServiceRate == null || userData.withdrawServiceType == null">跟随渠道</template>
<template v-else>
@ -35,7 +38,6 @@
{{userData.withdrawServiceRate}} {{serviceUnit(userData.withdrawServiceType)}}
</template>
</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">{{userData.remark | defaultValue}}</el-descriptions-item>
<el-descriptions-item label="限制提现">
<boolean-tag :value="userData.limitWithdraw" size="small" true-type="danger" false-type="success"/>
</el-descriptions-item>
@ -51,6 +53,7 @@
<el-descriptions-item label="实名认证">
<boolean-tag :value="userData.isReal" size="small"/>
</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">{{userData.remark | defaultValue}}</el-descriptions-item>
</el-descriptions>
</div>
</div>