czg_team
/
video_delegate
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码合并

This commit is contained in:
YeMingfei666 2025-08-01 10:22:26 +08:00
parent 9a6a4b4c1d
commit 3abb12a538
4 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/httpRequest.js
View File

@ -16,7 +16,8 @@ const http = axios.create({
// const requestURl = "http://localhost:8100/czg/";
// const requestURl = "https://web-api.hnsiyao.cn/czg/";//测试
// const requestURl = "https://web.hnsiyao.cn/czg/";//正式
const requestURl = "http://192.168.1.31:8080/admin/";//php
// const requestURl = "http://192.168.1.31:8080/admin/";//php本地
const requestURl = "https://playlet.test.sxczgkj.com/admin/";//php测试服
/**
* 请求拦截
@ -39,6 +40,7 @@ http.interceptors.response.use(response => {
}
return response
}, error => {
console.log(error)
return Promise.reject(error)
})

37
src/views/campus/coupon.vue
View File

@ -56,7 +56,7 @@
</el-button> -->
</div>
</div>
<el-table v-loading="tableDataLoadingKm" :data="tableDataKm.records" @selection-change="changeFunP" >
<el-table-column type="selection">
</el-table-column>
@ -67,7 +67,7 @@
<el-table-column prop="sdkContent" label="卡密">
</el-table-column>
<el-table-column prop="sysUserName" label="渠道商名称">
</el-table-column>
<el-table-column prop="giveNum" label="赠送会员天数">
</el-table-column>
@ -121,7 +121,7 @@
<el-button type="primary" @click="amendNoticeTo()">确 定</el-button>
</div>
</el-dialog>
<!-- 生成卡密 -->
<el-dialog title="生成卡密" :visible.sync="dialogFormVisible3" center width="70%">
<div style="margin-bottom: 10px;">
@ -187,7 +187,7 @@
<el-table-column prop="sdkContent" label="卡密">
</el-table-column>
<el-table-column prop="sysUserName" label="渠道商名称">
</el-table-column>
<el-table-column prop="giveNum" label="赠送会员天数" width="80">
</el-table-column>
@ -236,7 +236,7 @@
</el-table-column>
<el-table-column prop="qdRate" header-align="center" align="center" label="渠道佣金">
<!-- <template slot-scope="scope">
<span v-for="(item,index) in scope.row.roleEntityList" :key="index">{{item.roleName}} </span>
<span v-for="(item,index) in scope.row.roleEntityList" :key="index">{{item.roleName}} </span>
</template> -->
</el-table-column>
<el-table-column prop="qdCode" header-align="center" align="center" label="渠道码">
@ -395,7 +395,7 @@
this.page = val;
this.dataSelectKm()
},
handleSizeChangeY(val) {
this.size1 = val;
this.dataSelectYhq()
@ -477,9 +477,9 @@
});
return
}
if (this.titles == '添加') {
var url = 'couponCard/insertCouponCardType'
} else {
@ -518,7 +518,7 @@
}
})
}
})
},
//删除
@ -698,7 +698,7 @@
'typeId': this.couponCardTypeId,
'num':this.num,
'sysUserId':this.sysUserId,
})
}).then(({
data
@ -723,7 +723,7 @@
}
})
}
})
},
// 卡密列表
@ -750,6 +750,7 @@
'startTime': this.startTime,
'sysUserName':this.sysUserNameT,
'sysUserId':this.sysUserId,
'userId':this.sysUserId,
})
}).then(({
data
@ -757,7 +758,7 @@
this.tableDataLoadingKm = false
let returnData = data.data;
this.tableDataKm = returnData
})
},
// 详情跳转
@ -780,7 +781,7 @@
this.dataSelectKm()
this.dialogFormVisibleKm = true
},
// 导出
excelStair(){
// var endTime = this.endTime
@ -800,7 +801,7 @@
'endTime': this.endTime,
'startTime': this.startTime,
'sysUserName':this.sysUserNameT
})
}).then(({
data
@ -859,7 +860,7 @@
}
})
}
})
}).catch(() => {})
},
@ -902,7 +903,7 @@
qudaoBtn(){
this.getDataList()
this.dialogFormVisibleQd = true
},
getDataList() {
this.dataListLoading = true
@ -932,7 +933,7 @@
this.sysUserName = row.username
this.dialogFormVisibleQd = false
},
},
mounted() {
if(this.$cookie.get('sysUserId')&&this.$cookie.get('sysUserId')!='null'){

23
src/views/common/login.vue
View File

@ -187,9 +187,13 @@ export default {
this.$http({
// url: this.$http.adornUrl('app/Login/sendMsg/'+this.tableData.mobile+'/regis'),
url: this.$http.adornUrl(
"app/Login/sendMsg/" + this.dataForm.mobile + "/regis"
"Login/sendMsg/" + this.dataForm.mobile + "/regis"
),
method: "get",
params:{
phone: this.dataForm.mobile,
event:'regis'
}
}).then((res) => {
console.log(res);
if (res.data.code == 0) {
@ -284,11 +288,20 @@ export default {
});
},
// 获取验证码
getCaptcha() {
async getCaptcha() {
this.dataForm.uuid = getUUID();
this.captchaPath = this.$http.adornUrl(
`/captcha.jpg?uuid=${this.dataForm.uuid}`
);
const res =await this.$http({
url: this.$http.adornUrl("indetcode/getCode"),
method:'get',
params:{
uuid:this.dataForm.uuid
}
})
console.log(res);
this.captchaPath=res.data.data.img
// this.captchaPath = this.$http.adornUrl(
// `/captcha.jpg?uuid=${this.dataForm.uuid}`
// );
},
},
};

8
src/views/finance/storeincome.vue
View File

@ -955,9 +955,13 @@ export default {
this.$http({
// url: this.$http.adornUrl('app/Login/sendMsg/'+this.tableData.mobile+'/regis'),
url: this.$http.adornUrl(
"app/Login/sendMsg/" + this.tableData.mobile + "/regis"
"Login/sendMsg/" + this.tableData.mobile + "/regis"
),
method: "get",
params:{
phone: this.tableData.mobile,
event:'regis'
}
}).then((res) => {
console.log(res);
if (res.data.code == 0) {
@ -1414,7 +1418,7 @@ export default {
});
return;
}
// this.tableDataLoading1 = true
this.tableDataLoading1 = true
let userId = this.$cookie.get("userId");
this.$http({
// url: this.$http.adornUrl('cash/cashMoney'),