faiz
/
hy-shop-mer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add

This commit is contained in:
faiz 2024-04-18 11:07:43 +08:00
parent bd8b741387
commit e047b29738
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/order/index.vue
View File

@ -223,7 +223,7 @@
<el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" @click="edit(scope.row.order_id)">编辑</el-button> <el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" @click="edit(scope.row.order_id)">编辑</el-button>
<el-button v-if="(scope.row.order_type == 0 || scope.row.order_type == 2) && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click="send(scope.row,scope.row.order_id)">发送货</el-button> <el-button v-if="(scope.row.order_type == 0 || scope.row.order_type == 2) && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click="send(scope.row,scope.row.order_id)">发送货</el-button>
<el-button v-if="scope.row.is_del !== 0" type="text" size="small" @click.native="handleDelete(scope.row, scope.$index)">删除</el-button> <el-button v-if="scope.row.is_del !== 0" type="text" size="small" @click.native="handleDelete(scope.row, scope.$index)">删除</el-button>
<el-button :disabled='!!scope.row.refund_open' v-if="(scope.row.paid ==1 && scope.row.status !=-1)" type="text" size="small" @click="onOrderOpenRefund(scope.row.order_id)">开启售后</el-button> <el-button :disabled='!!scope.row.refund_open' v-if="(scope.row.paid ==1 && scope.row.status !=-1 && scope.row.status !=0)" type="text" size="small" @click="onOrderOpenRefund(scope.row.order_id)">开启售后</el-button>
<el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button> <el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button>
</template> </template>
</el-table-column> </el-table-column>

6
src/views/systemForm/setSystem/modifyStoreInfo.vue
View File

@ -457,7 +457,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="客服电话：" prop="service_phone"> <el-form-item label="客服电话：" prop="service_phone">
<el-input v-model="merData.service_phone" type="number" /> <el-input v-model="merData.service_phone" type="text" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -572,7 +572,8 @@ export default {
components: { Maps, VueQr }, components: { Maps, VueQr },
data() { data() {
var checkPhone = (rule, value, callback) => { var checkPhone = (rule, value, callback) => {
if (value === '') { console.log(value)
if (!value) {
callback(new Error('请输入客服电话')) callback(new Error('请输入客服电话'))
} else { } else {
let regPone = null let regPone = null
@ -673,6 +674,7 @@ export default {
mer_take_day: [], mer_take_day: [],
mer_take_location: '', mer_take_location: '',
id: 0, id: 0,
service_phone:'',
mer_take_status: 0 }, // 默认数据 mer_take_status: 0 }, // 默认数据
myHeaders: { 'X-Token': getToken() }, myHeaders: { 'X-Token': getToken() },
uploadedQualifications: [], // 资质图片列表 uploadedQualifications: [], // 资质图片列表