yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

📖 code review：【分销】我的团队

pull/36/MERGE
YunaiV 2024-01-04 22:22:37 +08:00
parent 2317d14ef5
commit 8b239a0aae
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sheep/api/promotion/diy/template.js
View File

@ -1,12 +1,12 @@
import request from '@/sheep/request'; import request from '@/sheep/request';
const DiyTemplateApi = { const DiyTemplateApi = {
// getUsedDiyTemplate: () => { getUsedDiyTemplate: () => {
// return request({ return request({
// url: '/app-api/promotion/diy-template/used', url: '/app-api/promotion/diy-template/used',
// method: 'GET', method: 'GET',
// }); });
// }, },
getDiyTemplate: (id) => { getDiyTemplate: (id) => {
return request({ return request({
url: '/app-api/promotion/diy-template/get', url: '/app-api/promotion/diy-template/get',

4
sheep/request/index.js
View File

@ -214,8 +214,8 @@ const request = (config) => {
} }
// TODO 芋艿：额外拼接 // TODO 芋艿：额外拼接
if (config.url.indexOf('/app-api/') >= 0) { if (config.url.indexOf('/app-api/') >= 0) {
config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】 // config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】
// config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】 config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】
// config.url = 'http://yunai.natapp1.cc' + config.url; // 调用【natapp】 // config.url = 'http://yunai.natapp1.cc' + config.url; // 调用【natapp】
} }
return http.middleware(config); return http.middleware(config);

4
uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue
View File

@ -154,6 +154,7 @@
}, },
value(newVal) { value(newVal) {
this.dataList = this.getDataList(newVal) this.dataList = this.getDataList(newVal)
// TODO @芋艿：这块可能被错误的注释了，需要跟进下
// fix by mehaotian is_reset 在 uni-forms 中定义 // fix by mehaotian is_reset 在 uni-forms 中定义
// if(!this.is_reset){ // if(!this.is_reset){
// this.is_reset = false // this.is_reset = false
@ -162,6 +163,7 @@
}, },
modelValue(newVal) { modelValue(newVal) {
this.dataList = this.getDataList(newVal); this.dataList = this.getDataList(newVal);
// TODO @芋艿：这块可能被错误的注释了，需要跟进下
// if(!this.is_reset){ // if(!this.is_reset){
// this.is_reset = false // this.is_reset = false
// this.formItem && this.formItem.setValue(newVal) // this.formItem && this.formItem.setValue(newVal)
@ -405,7 +407,7 @@
let selectedColor = this.selectedColor?this.selectedColor:'#2979ff' let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
styles['background-color'] = item.selected?selectedColor:'#fff' styles['background-color'] = item.selected?selectedColor:'#fff'
styles['border-color'] = item.selected?selectedColor:'#DCDFE6' styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
if(!item.selected && item.disabled){ if(!item.selected && item.disabled){
styles['background-color'] = '#F2F6FC' styles['background-color'] = '#F2F6FC'
styles['border-color'] = item.selected?selectedColor:'#DCDFE6' styles['border-color'] = item.selected?selectedColor:'#DCDFE6'