Skip to content

W
wx-boss
Commit 126761d2 by 姜雷
Options

Merge branch 'develop' into test

parents abffc04a 892f8545
Showing with 80 additions and 18 deletions
miniprogram/pages/areaSelect/areaSelect.js
......@@ -9,6 +9,7 @@ Page({
areaList: [],
filterList: [],
methodName: '',
inputValue: '',
},
onLoad: function (options) {
console.log(options);
......@@ -37,6 +38,7 @@ Page({
if (index > -1) {
_this.setData({
selectedIndex: index,
inputValue: res.data[index].areaName,
});
}
}
......@@ -65,6 +67,14 @@ Page({
console.log(e, value);
this.getFilterListByName(value);
},
clearInputValue: function () {
console.log('in clearInputValue');
this.setData({
inputValue: '',
selected: '',
selectedIndex: '',
});
},
getFilterListByName: function (name) {
var filterList = [];
if (name) {
......@@ -85,7 +95,7 @@ Page({
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2];
var entity = {
id: value,
id: this.data.filterList[value].id,
name: this.data.filterList[value].areaName,
};
if (this.data.methodName && prevPage[this.data.methodName]) {
......@@ -113,4 +123,4 @@ Page({
wx.navigateBack({ delta: 1 });
},
});
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"areaSelect.js","sourceRoot":"","sources":["areaSelect.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch } from '../../api/fetch';\nimport { delay } from '../../utils/util';\n\n// miniprogram/pages/areaSelect/areaSelect.js\nPage({\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    selected: '',\n    selectedIndex: '',\n    areaList: [],\n    filterList: [],\n    methodName: '',\n  },\n\n  /**\n   * 生命周期函数--监听页面加载\n   */\n  onLoad: function(options) {\n    console.log(options);\n    const { methodName, value } = options;\n    this.fetchAreaList();\n    this.setData!({\n      methodName,\n      selected: value,\n    });\n  },\n  /**\n   * 生命周期函数--监听页面显示\n   */\n  onShow: function() {},\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n            filterList: res.data,\n          });\n          if (this.data.selected) {\n            let index = res.data.findIndex(\n              item => item.id == this.data.selected,\n            );\n            console.log(this.data.selected, index);\n            if (index > -1) {\n              this.setData({\n                selectedIndex: index,\n              });\n            }\n          }\n        } else {\n          this.setData!({\n            areaList: [],\n            filterList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  inputHandle(e) {\n    const { value } = e.detail;\n    console.log(e, value);\n    delay(() => {\n      this.getFilterListByName(value);\n    }, 500);\n  },\n  confirmHandle(e) {\n    const { value } = e.detail;\n    console.log(e, value);\n    this.getFilterListByName(value);\n  },\n  getFilterListByName(name: string) {\n    let filterList = [];\n    if (name) {\n      filterList = this.data.areaList.filter(item =>\n        item['areaName'].includes(name),\n      );\n    } else {\n      filterList = this.data.areaList;\n    }\n    this.setData({\n      filterList,\n    });\n  },\n  selectedHandle(e) {\n    const { value } = e.currentTarget.dataset;\n    console.log(e, value);\n    // if (this.data.selectedIndex === value) {\n    //   this.setData({\n    //     selected: '',\n    //     selectedIndex: '',\n    //   });\n    // } else {\n    //   this.setData({\n    //     selected: this.data.filterList[value].id,\n    //     selectedIndex: value,\n    //   });\n    // }\n    var pages = getCurrentPages();\n    var prevPage = pages[pages.length - 2]; //上一个页面\n    let entity = {\n      id: value,\n      name: this.data.filterList[value].areaName,\n    };\n\n    if (this.data.methodName && prevPage[this.data.methodName]) {\n      prevPage[this.data.methodName](entity);\n    }\n    wx.navigateBack({ delta: 1 });\n  },\n  bindPickerChange() {\n    let value = this.data.selected;\n    // this.setData!({\n    //   showPickerView: false,\n    // });\n    // this.triggerEvent('change', { value }, {});\n    var pages = getCurrentPages();\n    var prevPage = pages[pages.length - 2]; //上一个页面\n    let entity = {};\n    if (value) {\n      entity = {\n        id: value,\n        name: this.data.filterList[this.data.selectedIndex].areaName,\n      };\n    } else {\n      entity = { id: '', name: '' };\n    }\n    if (this.data.methodName && prevPage[this.data.methodName]) {\n      prevPage[this.data.methodName](entity);\n    }\n    wx.navigateBack({ delta: 1 });\n  },\n});\n"]}
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"areaSelect.js","sourceRoot":"","sources":["areaSelect.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch } from '../../api/fetch';\nimport { delay } from '../../utils/util';\n\n// miniprogram/pages/areaSelect/areaSelect.js\nPage({\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    selected: '',\n    selectedIndex: '',\n    areaList: [],\n    filterList: [],\n    methodName: '',\n    inputValue: '',\n  },\n\n  /**\n   * 生命周期函数--监听页面加载\n   */\n  onLoad: function(options) {\n    console.log(options);\n    const { methodName, value } = options;\n    this.fetchAreaList();\n    this.setData!({\n      methodName,\n      selected: value,\n    });\n  },\n  /**\n   * 生命周期函数--监听页面显示\n   */\n  onShow: function() {},\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n            filterList: res.data,\n          });\n          if (this.data.selected) {\n            let index = res.data.findIndex(\n              item => item.id == this.data.selected,\n            );\n            console.log(this.data.selected, index);\n            if (index > -1) {\n              this.setData({\n                selectedIndex: index,\n                inputValue: res.data[index].areaName,\n              });\n            }\n          }\n        } else {\n          this.setData!({\n            areaList: [],\n            filterList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  inputHandle(e) {\n    const { value } = e.detail;\n    console.log(e, value);\n    delay(() => {\n      this.getFilterListByName(value);\n    }, 500);\n  },\n  confirmHandle(e) {\n    const { value } = e.detail;\n    console.log(e, value);\n    this.getFilterListByName(value);\n  },\n  clearInputValue() {\n    console.log('in clearInputValue');\n    this.setData!({\n      inputValue: '',\n      selected: '',\n      selectedIndex: '',\n    });\n  },\n  getFilterListByName(name: string) {\n    let filterList = [];\n    if (name) {\n      filterList = this.data.areaList.filter(item =>\n        item['areaName'].includes(name),\n      );\n    } else {\n      filterList = this.data.areaList;\n    }\n    this.setData!({\n      filterList,\n    });\n  },\n  selectedHandle(e) {\n    const { value } = e.currentTarget.dataset;\n    console.log(e, value);\n    // if (this.data.selectedIndex === value) {\n    //   this.setData({\n    //     selected: '',\n    //     selectedIndex: '',\n    //   });\n    // } else {\n    //   this.setData({\n    //     selected: this.data.filterList[value].id,\n    //     selectedIndex: value,\n    //   });\n    // }\n    var pages = getCurrentPages();\n    var prevPage = pages[pages.length - 2]; //上一个页面\n    let entity = {\n      id: this.data.filterList[value].id,\n      name: this.data.filterList[value].areaName,\n    };\n\n    if (this.data.methodName && prevPage[this.data.methodName]) {\n      prevPage[this.data.methodName](entity);\n    }\n    wx.navigateBack({ delta: 1 });\n  },\n  bindPickerChange() {\n    let value = this.data.selected;\n    // this.setData!({\n    //   showPickerView: false,\n    // });\n    // this.triggerEvent('change', { value }, {});\n    var pages = getCurrentPages();\n    var prevPage = pages[pages.length - 2]; //上一个页面\n    let entity = {};\n    if (value) {\n      entity = {\n        id: value,\n        name: this.data.filterList[this.data.selectedIndex].areaName,\n      };\n    } else {\n      entity = { id: '', name: '' };\n    }\n    if (this.data.methodName && prevPage[this.data.methodName]) {\n      prevPage[this.data.methodName](entity);\n    }\n    wx.navigateBack({ delta: 1 });\n  },\n});\n"]}
\ No newline at end of file
miniprogram/pages/areaSelect/areaSelect.ts
......@@ -12,6 +12,7 @@ Page({
areaList: [],
filterList: [],
methodName: '',
inputValue: '',
},
/**
......@@ -48,6 +49,7 @@ Page({
if (index > -1) {
this.setData({
selectedIndex: index,
inputValue: res.data[index].areaName,
});
}
}
......@@ -74,6 +76,14 @@ Page({
console.log(e, value);
this.getFilterListByName(value);
},
clearInputValue() {
console.log('in clearInputValue');
this.setData!({
inputValue: '',
selected: '',
selectedIndex: '',
});
},
getFilterListByName(name: string) {
let filterList = [];
if (name) {
......@@ -83,7 +93,7 @@ Page({
} else {
filterList = this.data.areaList;
}
this.setData({
this.setData!({
filterList,
});
},
......@@ -104,7 +114,7 @@ Page({
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2]; //上一个页面
let entity = {
id: value,
id: this.data.filterList[value].id,
name: this.data.filterList[value].areaName,
};
......
miniprogram/pages/areaSelect/areaSelect.wxml
<!-- miniprogram/pages/areaSelect/areaSelect.wxml -->
<view class="areaselect-pickBox">
<view class="areaselect-pickFilter">
<input class="areaselect-pickInput" type="text" bindinput="inputHandle" bindconfirm="confirmHandle" />
<input class="areaselect-pickInput" type="text" value="{{inputValue}}" bindinput="inputHandle" bindconfirm="confirmHandle" />
<view class="areaselect-pickInput-clear" wx:if="{{inputValue}}" catch:tap="clearInputValue">
<image class="areaselect-pickInput-clear-icon" src="../../images/ic_guanbi@2x.png" />
</view>
<view class="areaselect-pickBtn" bindtap="bindPickerChange">确认</view>
</view>
<view class="areaselect-list">
......
miniprogram/pages/areaSelect/areaSelect.wxss
......@@ -13,6 +13,7 @@ page {
flex-direction: column;
}
.areaselect-pickFilter {
position: relative;
display: flex;
padding: 40rpx 40rpx 0;
align-items: center;
......@@ -20,6 +21,17 @@ page {
.areaselect-pickInput {
flex: 1;
}
.areaselect-pickInput-clear {
position: absolute;
width: 40rpx;
height: 40rpx;
right: 175rpx;
z-index: 2;
}
.areaselect-pickInput-clear-icon {
width: 100%;
height: 100%;
}
.areaselect-pickBtn {
color: #6895fe;
margin-left: 20rpx;
......
miniprogram/pages/components/PayTypeChart/PayTypeChart.js
......@@ -58,7 +58,11 @@ function initChart(canvas, width, height, F2) {
var coord = paytypeChart.get('coord');
frontPlot.addShape('sector', {
attrs: {
fill: '#000',
x: coord.center.x - coord.circleRadius - coord.start.x + coord.endAngle,
y: coord.center.y,
r: 0,
r0: coord.circleRadius * coord.innerRadius,
fill: '#fff',
},
});
paytypeChart.get('canvas').draw();
......@@ -77,7 +81,16 @@ Component({
marker: 'square',
itemFormatter: function (val) {
var item = newVal.find(function (item) { return item.key === val; });
return item ? item.name + ' ' + util_1.formatPrice(item.count) : '';
if (item) {
var name_1 = item.name;
if (item && item.name.length < 4) {
name_1 += '\xa0\xa0\xa0';
}
return name_1 + ' ' + util_1.formatPrice(item.count);
}
else {
return '';
}
},
});
paytypeChart && paytypeChart.changeData(newVal);
......@@ -97,4 +110,4 @@ Component({
},
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF5VHlwZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUGF5VHlwZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNENBQWtEO0FBR2xELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztBQUN4QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFDZixJQUFNLFFBQVEsR0FBRztJQUNmLElBQUksRUFBRSxTQUFTO0lBQ2YsSUFBSSxFQUFFLFNBQVM7SUFDZixRQUFRLEVBQUUsU0FBUztJQUNuQixNQUFNLEVBQUUsU0FBUztDQUNsQixDQUFDO0FBRUYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN4QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsT0FBTyxDQUFDO1FBQ25CLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FB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dGlscy91dGlsJztcblxuLy8gcGFnZXMvY29tcG9uZW50cy9QYXlUeXBlQ2hhcnQvUGF5VHlwZUNoYXJ0LmpzXG5sZXQgcGF5dHlwZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuY29uc3QgY29sb3JNYXAgPSB7XG4gIGFpbWk6ICcjRUI3RTU5JyxcbiAgYmVhbjogJyMxM0MyQzInLFxuICBkaXNjb3VudDogJyNGQUNDMTQnLFxuICBvbmxpbmU6ICcjMTg5MEZGJyxcbn07XG5cbmZ1bmN0aW9uIGluaXRDaGFydChjYW52YXMsIHdpZHRoLCBoZWlnaHQsIEYyKSB7XG4gIGNvbnN0IGRhdGEgPSBbXTtcbiAgcGF5dHlwZUNoYXJ0ID0gbmV3IEYyLkNoYXJ0KHtcbiAgICBlbDogY2FudmFzLFxuICAgIHdpZHRoLFxuICAgIGhlaWdodCxcbiAgfSk7XG5cbiAgcGF5dHlwZUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LnRvb2x0aXAoe1xuICAgIHNob3dJdGVtTWFya2VyOiBmYWxzZSxcbiAgICBiYWNrZ3JvdW5kOiB7XG4gICAgICByYWRpdXM6IDIsXG4gICAgICBmaWxsOiAnI2YxNjZmZCcsXG4gICAgICBwYWRkaW5nOiBbNiwgMTBdLFxuICAgIH0sXG4gICAgb25TaG93KGV2KSB7XG4gICAgICBjb25zdCB7IGl0ZW1zIH0gPSBldjtcbiAgICAgIGl0ZW1zWzBdLm5hbWUgPSAnJztcbiAgICAgIGl0ZW1zWzBdLnZhbHVlID0gbW9udGggKyAnLScgKyBpdGVtc1swXS50aXRsZTtcbiAgICAgIGl0ZW1zWzFdLm5hbWUgPSAnJztcbiAgICAgIGl0ZW1zWzFdLnZhbHVlID0gaXRlbXNbMV0udmFsdWUgKyAn5YWDJztcbiAgICB9LFxuICB9KTtcblxuICBwYXl0eXBlQ2hhcnQuY29vcmQoJ3BvbGFyJywge1xuICAgIHRyYW5zcG9zZWQ6IHRydWUsXG4gICAgaW5uZXJSYWRpdXM6IDAuNSxcbiAgICByYWRpdXM6IDAuOSxcbiAgfSk7XG4gIHBheXR5cGVDaGFydC5sZWdlbmQoe1xuICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgIG1hcmtlcjogJ3NxdWFyZScsXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQudG9vbHRpcChmYWxzZSk7XG4gIHBheXR5cGVDaGFydFxuICAgIC5pbnRlcnZhbCgpXG4gICAgLnBvc2l0aW9uKCdhKmNvdW50JylcbiAgICAuY29sb3IoJ2tleScsIFsnI0VCN0U1OScsICcjMTNDMkMyJywgJyNGQUNDMTQnLCAnIzE4OTBGRiddKVxuICAgIC5hZGp1c3QoJ3N0YWNrJyk7XG4gIHBheXR5cGVDaGFydC5heGlzKGZhbHNlKTtcbiAgcGF5dHlwZUNoYXJ0LnJlbmRlcigpO1xuXG4gIC8vIOe7mOWItuWGhemYtOW9sVxuICBjb25zdCBmcm9udFBsb3QgPSBwYXl0eXBlQ2hhcnQuZ2V0KCdmcm9udFBsb3QnKTtcbiAgY29uc3QgY29vcmQgPSBwYXl0eXBlQ2hhcnQuZ2V0KCdjb29yZCcpOyAvLyDojrflj5blnZDmoIfns7vlr7nosaFcbiAgZnJvbnRQbG90LmFkZFNoYXBlKCdzZWN0b3InLCB7XG4gICAgYXR0cnM6IHtcbiAgICAgIGZpbGw6ICcjMDAwJyxcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LmdldCgnY2FudmFzJykuZHJhdygpO1xuICBjb25zb2xlLmxvZygnY29vcmQnLCBjb29yZCk7XG5cbiAgcmV0dXJuIHBheXR5cGVDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBwYXl0eXBlQ2hhcnQgJiZcbiAgICAgICAgICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICAgICAgICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgICAgICAgICAgbWFya2VyOiAnc3F1YXJlJyxcbiAgICAgICAgICAgIGl0ZW1Gb3JtYXR0ZXI6IHZhbCA9PiB7XG4gICAgICAgICAgICAgIGxldCBpdGVtID0gbmV3VmFsLmZpbmQoaXRlbSA9PiBpdGVtLmtleSA9PT0gdmFsKTtcbiAgICAgICAgICAgICAgcmV0dXJuIGl0ZW0gPyBpdGVtLm5hbWUgKyAnICAgICcgKyBmb3JtYXRQcmljZShpdGVtLmNvdW50KSA6ICcnO1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIC8vIGN1c3RvbTogdHJ1ZSxcbiAgICAgICAgICAgIC8vIGl0ZW1zOiBuZXdWYWwubWFwKGl0ZW0gPT4gKHtcbiAgICAgICAgICAgIC8vICAgbmFtZTogaXRlbS5uYW1lLFxuICAgICAgICAgICAgLy8gICB2YWx1ZTogJyAnICsgZm9ybWF0UHJpY2UoaXRlbS5jb3VudCksXG4gICAgICAgICAgICAvLyAgIG1hcmtlcjoge1xuICAgICAgICAgICAgLy8gICAgIHN5bWJvbDogJ3NxdWFyZScsXG4gICAgICAgICAgICAvLyAgICAgZmlsbDogY29sb3JNYXBbaXRlbS5rZXldLFxuICAgICAgICAgICAgLy8gICAgIHJhZGl1czogNCxcbiAgICAgICAgICAgIC8vICAgfSxcbiAgICAgICAgICAgIC8vIH0pKSxcbiAgICAgICAgICB9KTtcbiAgICAgICAgcGF5dHlwZUNoYXJ0ICYmIHBheXR5cGVDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PayTypeChart.js","sourceRoot":"","sources":["PayTypeChart.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatPrice } from '../../../utils/util';\n\n// pages/components/PayTypeChart/PayTypeChart.js\nlet paytypeChart = null;\nlet month = '';\nconst colorMap = {\n  aimi: '#EB7E59',\n  bean: '#13C2C2',\n  discount: '#FACC14',\n  online: '#1890FF',\n};\n\nfunction initChart(canvas, width, height, F2) {\n  const data = [];\n  paytypeChart = new F2.Chart({\n    el: canvas,\n    width,\n    height,\n  });\n\n  paytypeChart.source(data, {\n    days: {\n      min: 1,\n      max: 31,\n    },\n  });\n  paytypeChart.tooltip({\n    showItemMarker: false,\n    background: {\n      radius: 2,\n      fill: '#f166fd',\n      padding: [6, 10],\n    },\n    onShow(ev) {\n      const { items } = ev;\n      items[0].name = '';\n      items[0].value = month + '-' + items[0].title;\n      items[1].name = '';\n      items[1].value = items[1].value + '元';\n    },\n  });\n\n  paytypeChart.coord('polar', {\n    transposed: true,\n    innerRadius: 0.5,\n    radius: 0.9,\n  });\n  paytypeChart.legend({\n    position: 'right',\n    marker: 'square',\n  });\n  paytypeChart.tooltip(false);\n  paytypeChart\n    .interval()\n    .position('a*count')\n    .color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])\n    .adjust('stack');\n  paytypeChart.axis(false);\n  paytypeChart.render();\n\n  // 绘制内阴影\n  const frontPlot = paytypeChart.get('frontPlot');\n  const coord = paytypeChart.get('coord'); // 获取坐标系对象\n  frontPlot.addShape('sector', {\n    attrs: {\n      x: coord.center.x - coord.circleRadius - coord.start.x + coord.endAngle,\n      y: coord.center.y,\n      r: 0, // 全半径\n      r0: coord.circleRadius * coord.innerRadius,\n      fill: '#fff',\n    },\n  });\n  paytypeChart.get('canvas').draw();\n  console.log('coord', coord);\n\n  return paytypeChart;\n}\n\nComponent({\n  properties: {\n    dataList: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        paytypeChart &&\n          paytypeChart.legend({\n            position: 'right',\n            marker: 'square',\n            itemFormatter: val => {\n              let item = newVal.find(item => item.key === val);\n              if (item) {\n                let name = item.name;\n                if (item && item.name.length < 4) {\n                  name += '\\xa0\\xa0\\xa0';\n                }\n                return name + '   ' + formatPrice(item.count);\n              } else {\n                return '';\n              }\n            },\n            // custom: true,\n            // items: newVal.map(item => ({\n            //   name: item.name,\n            //   value: ' ' + formatPrice(item.count),\n            //   marker: {\n            //     symbol: 'square',\n            //     fill: colorMap[item.key],\n            //     radius: 4,\n            //   },\n            // })),\n          });\n        paytypeChart && paytypeChart.changeData(newVal);\n      },\n    },\n    month: {\n      type: String,\n      value: '',\n      observer(newVal) {\n        month = newVal;\n      },\n    },\n  },\n  data: {\n    opts: {\n      onInit: initChart,\n    },\n  },\n});\n"]}
\ No newline at end of file
miniprogram/pages/components/PayTypeChart/PayTypeChart.ts
......@@ -63,7 +63,11 @@ function initChart(canvas, width, height, F2) {
const coord = paytypeChart.get('coord'); // 获取坐标系对象
frontPlot.addShape('sector', {
attrs: {
fill: '#000',
x: coord.center.x - coord.circleRadius - coord.start.x + coord.endAngle,
y: coord.center.y,
r: 0, // 全半径
r0: coord.circleRadius * coord.innerRadius,
fill: '#fff',
},
});
paytypeChart.get('canvas').draw();
......@@ -84,7 +88,15 @@ Component({
marker: 'square',
itemFormatter: val => {
let item = newVal.find(item => item.key === val);
return item ? item.name + ' ' + formatPrice(item.count) : '';
if (item) {
let name = item.name;
if (item && item.name.length < 4) {
name += '\xa0\xa0\xa0';
}
return name + ' ' + formatPrice(item.count);
} else {
return '';
}
},
// custom: true,
// items: newVal.map(item => ({
......
miniprogram/pages/index/index.wxss
......@@ -18,17 +18,19 @@
}
.login-input-password {
position: relative;
display: flex;
align-items: center;
}
.login-input-password .login-input {
flex: 1;
margin-bottom: 0;
margin-right: 10rpx;
}
.password-eyes {
position: absolute;
width: 44rpx;
height: 44rpx;
right: 40rpx;
top: 10rpx;
z-index: 2;
padding: 10rpx;
padding: 20rpx;
}
.password-eyes-icon {
width: 100%;
......
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