Merge branch 'main' of http://git.zihai.cn/szj1219/JiaZhiQianYan-MiniProgram

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/concept/historicalTimeline/historicalTimeline.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js

unpackage/dist/dev/mp-weixin/pages/mine/investPreference/investPreference.js

@@ -1,278 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const request_api = require("../../../request/api.js");
-const common_assets = require("../../../common/assets.js");
-const _sfc_main = {
-  data() {
-    return {
-      avatarTop: "",
-      contentTop: "",
-      avatar: "",
-      //选择头像临时地址
-      avatarUrl: "",
-      //已上传的链接
-      investPreferenceList: ["长期投资", "中短期投资", "风险控制型"],
-      selectInvestIndex: -1,
-      stockYearList: ["新手入门", "1年以内", "1-3年", "3-5年", "5-10年", "10年以上"],
-      selectYearIndex: -1,
-      riskPreferenceList: ["保守型", "稳健型", "积极型"],
-      selectRiskIndex: -1,
-      investmentScaleList: ["50万以下", "50-100万", "100万以上"],
-      selectScaleIndex: -1,
-      preferredMarketList: [{ title: "A股" }, { title: "港股" }, { title: "美股" }, { title: "期货" }, { title: "虚拟货币" }, { title: "新兴市场" }]
-    };
-  },
-  onLoad() {
-    this.avatarTop = common_vendor.inject("navHeight") + 60 / 750 * common_vendor.inject("windowWidth");
-    this.contentTop = this.avatarTop + 75 / 750 * common_vendor.inject("windowWidth");
-    this.getUserInfoData();
-  },
-  methods: {
-    /**
-     * 点击选择头像
-     * @param {Object} e
-     */
-    chooseAvatar(e) {
-      this.avatar = e.detail.avatarUrl;
-    },
-    /**
-     * 点击选择投资偏好
-     * @param {Object} index
-     */
-    clickInvestItem(index) {
-      if (this.selectInvestIndex != index) {
-        this.selectInvestIndex = index;
-      }
-    },
-    /**
-     * 点击选择风险偏好
-     * @param {Object} index
-     */
-    clickYearItem(index) {
-      if (this.selectYearIndex != index) {
-        this.selectYearIndex = index;
-      }
-    },
-    /**
-     * 点击选择风险偏好
-     * @param {Object} index
-     */
-    clickRiskItem(index) {
-      if (this.selectRiskIndex != index) {
-        this.selectRiskIndex = index;
-      }
-    },
-    /**
-     * 点击选择投资规模
-     * @param {Object} index
-     */
-    clickScaleItem(index) {
-      if (this.selectScaleIndex != index) {
-        this.selectScaleIndex = index;
-      }
-    },
-    /**
-     * 点击选择市场偏好
-     * @param {Object} index
-     */
-    clickMarketItem(index) {
-      this.preferredMarketList[index].select = !this.preferredMarketList[index].select;
-    },
-    /**
-     * 点击上一步
-     */
-    clickPre() {
-      common_vendor.index.navigateBack();
-    },
-    /**
-     * 点击完成
-     */
-    clickFinish() {
-      if (this.selectInvestIndex < 0) {
-        common_vendor.index.showToast({
-          title: "请选择投资偏好",
-          icon: "none"
-        });
-        return;
-      }
-      if (this.selectYearIndex < 0) {
-        common_vendor.index.showToast({
-          title: "请选择炒股年限",
-          icon: "none"
-        });
-        return;
-      }
-      if (this.selectRiskIndex < 0) {
-        common_vendor.index.showToast({
-          title: "请选择风险偏好",
-          icon: "none"
-        });
-        return;
-      }
-      if (this.selectScaleIndex < 0) {
-        common_vendor.index.showToast({
-          title: "请选择投资规模",
-          icon: "none"
-        });
-        return;
-      }
-      let arr = [];
-      for (let item of this.preferredMarketList) {
-        if (item.select) {
-          arr.push(item.title);
-        }
-      }
-      if (arr.length == 0) {
-        common_vendor.index.showToast({
-          title: "请选择偏好市场",
-          icon: "none"
-        });
-        return;
-      }
-      if (this.avatar) {
-        let param = { avatar: this.avatar, isFile: 1 };
-        updateBasicInfo(param).then((res) => {
-          this.uploadInvestPreferenceData();
-        }).catch((error) => {
-        });
-      } else
-        this.uploadInvestPreferenceData();
-    },
-    /**
-     * 更新投资偏好设置
-     */
-    uploadInvestPreferenceData() {
-      let arr = [];
-      for (let item of this.preferredMarketList) {
-        if (item.select) {
-          arr.push(item.title);
-        }
-      }
-      let param = {
-        trading_experience: this.selectYearIndex,
-        investment_style: this.investPreferenceList[this.selectInvestIndex],
-        risk_preference: this.riskPreferenceList[this.selectRiskIndex],
-        investment_amount: this.investmentScaleList[this.selectScaleIndex],
-        preferred_markets: arr
-      };
-      request_api.updateInvestPreference(param).then((res) => {
-        common_vendor.index.navigateBack({
-          delta: 2
-        });
-      }).catch((error) => {
-      });
-    },
-    /**
-     * 获取用户偏好设置数据
-     */
-    getUserInfoData() {
-      request_api.userInfo().then((res) => {
-        if (res.code == 200) {
-          this.avatarUrl = res.data.basic_info.avatar_url;
-          let data = res.data.investment_preferences;
-          for (var i = 0; i < this.investPreferenceList.length; i++) {
-            let item = this.investPreferenceList[i];
-            if (item == data.investment_style) {
-              this.selectInvestIndex = i;
-              break;
-            }
-          }
-          this.selectYearIndex = data.trading_experience;
-          for (var i = 0; i < this.riskPreferenceList.length; i++) {
-            let item = this.riskPreferenceList[i];
-            if (item == data.risk_preference) {
-              this.selectRiskIndex = i;
-              break;
-            }
-          }
-          for (var i = 0; i < this.investmentScaleList.length; i++) {
-            let item = this.investmentScaleList[i];
-            if (item == data.investment_amount) {
-              this.selectScaleIndex = i;
-              break;
-            }
-          }
-          for (let item of this.preferredMarketList) {
-            let arr = JSON.parse(data.preferred_markets);
-            let arr1 = arr[0].split(",");
-            if (arr1.indexOf(item.title) > -1) {
-              item.select = true;
-            } else {
-              item.select = false;
-            }
-          }
-        } else
-          common_vendor.wx$1.showToast({
-            title: res.message
-          });
-      }).catch((error) => {
-      });
-    }
-  }
-};
-if (!Array) {
-  const _easycom_navBar2 = common_vendor.resolveComponent("navBar");
-  _easycom_navBar2();
-}
-const _easycom_navBar = () => "../../../components/navBar/navBar.js";
-if (!Math) {
-  _easycom_navBar();
-}
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.p({
-      leftText: "信息完善"
-    }),
-    b: common_assets._imports_0,
-    c: $data.avatar ? $data.avatar : $data.avatarUrl,
-    d: common_assets._imports_1$5,
-    e: common_vendor.o((...args) => $options.chooseAvatar && $options.chooseAvatar(...args)),
-    f: common_vendor.s("top:" + $data.avatarTop + "px;"),
-    g: common_vendor.f($data.investPreferenceList, (item, index, i0) => {
-      return {
-        a: common_vendor.t(item),
-        b: common_vendor.n("item " + ($data.selectInvestIndex == index ? "select" : "")),
-        c: index,
-        d: common_vendor.o(($event) => $options.clickInvestItem(index), index)
-      };
-    }),
-    h: common_vendor.f($data.stockYearList, (item, index, i0) => {
-      return {
-        a: common_vendor.t(item),
-        b: common_vendor.n("item " + ($data.selectYearIndex == index ? "select" : "")),
-        c: index,
-        d: common_vendor.o(($event) => $options.clickYearItem(index), index)
-      };
-    }),
-    i: common_vendor.f($data.riskPreferenceList, (item, index, i0) => {
-      return {
-        a: common_vendor.t(item),
-        b: common_vendor.n("item " + ($data.selectRiskIndex == index ? "select" : "")),
-        c: index,
-        d: common_vendor.o(($event) => $options.clickRiskItem(index), index)
-      };
-    }),
-    j: common_vendor.f($data.investmentScaleList, (item, index, i0) => {
-      return {
-        a: common_vendor.t(item),
-        b: common_vendor.n("item " + ($data.selectScaleIndex == index ? "select" : "")),
-        c: index,
-        d: common_vendor.o(($event) => $options.clickScaleItem(index), index)
-      };
-    }),
-    k: common_vendor.f($data.preferredMarketList, (item, index, i0) => {
-      return {
-        a: common_vendor.t(item.title),
-        b: common_vendor.n("item " + (item.select ? "select" : "")),
-        c: index,
-        d: common_vendor.o(($event) => $options.clickMarketItem(index), index)
-      };
-    }),
-    l: common_vendor.s("top:" + $data.contentTop + "px;"),
-    m: common_vendor.o(($event) => $options.clickPre()),
-    n: common_vendor.o(($event) => $options.clickFinish())
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
-wx.createPage(MiniProgramPage);
-//# sourceMappingURL=../../../../.sourcemap/mp-weixin/pages/mine/investPreference/investPreference.js.map

unpackage/dist/dev/mp-weixin/pages/mine/investPreference/investPreference.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "nav-bar": "../../../components/navBar/navBar"
-  }
-}

unpackage/dist/dev/mp-weixin/pages/mine/investPreference/investPreference.wxml

@@ -1 +0,0 @@
-<view><nav-bar wx:if="{{a}}" u-i="18963204-0" bind:__l="__l" u-p="{{a}}"></nav-bar><image class="topBg absolute" src="{{b}}" mode="widthFix"></image><view class="avatarC fixed" style="{{f}}"><image class="avatar" src="{{c}}" mode="aspectFill"></image><image class="icon absolute" src="{{d}}" mode="widthFix"></image><button class="absolute" open-type="chooseAvatar" bindchooseavatar="{{e}}"></button></view><view class="preferenceC fixed" style="{{l}}"><view class="title">投资偏好设置</view><view class="section first">投资偏好</view><view class="list flexWrap"><view wx:for="{{g}}" wx:for-item="item" wx:key="c" class="{{item.b}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="section">炒股年限</view><view class="list flexWrap"><view wx:for="{{h}}" wx:for-item="item" wx:key="c" class="{{item.b}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="section">风险偏好</view><view class="list flexWrap"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class="{{item.b}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="section">投资规模</view><view class="list flexWrap"><view wx:for="{{j}}" wx:for-item="item" wx:key="c" class="{{item.b}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="section">偏好市场（可多选）</view><view class="list flexWrap"><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="{{item.b}}" bindtap="{{item.d}}">{{item.a}}</view></view></view><view class="bottomC fixed flex"><view class="pre btn" bindtap="{{m}}">上一步</view><view class="finish btn flex1" bindtap="{{n}}">完成</view></view></view>

unpackage/dist/dev/mp-weixin/pages/mine/investPreference/investPreference.wxss

@@ -1,96 +0,0 @@
-.topBg {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: auto;
-}
-.avatarC {
-  left: 0;
-  margin-left: calc((100% - 150rpx)/2);
-  width: 150rpx;
-  z-index: 10;
-}
-.avatarC .avatar {
-  width: 100%;
-  height: 150rpx;
-  border-radius: 50%;
-  border: solid 2rpx white;
-}
-.avatarC .icon {
-  right: 20rpx;
-  bottom: 0;
-  width: 40rpx;
-  height: auto;
-}
-.avatarC button {
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-.preferenceC {
-  background-color: white;
-  left: 0;
-  right: 0;
-  bottom: calc(73rpx + 17rpx + 80rpx);
-  border-radius: 20rpx 20rpx 0 0;
-  overflow-y: scroll;
-}
-.preferenceC .title {
-  margin: 150rpx 0 0 60rpx;
-  font-size: 36rpx;
-  font-weight: bold;
-}
-.preferenceC .section {
-  margin: 10rpx 60rpx 0;
-  line-height: 66rpx;
-  font-size: 26rpx;
-  font-weight: bold;
-}
-.preferenceC .section.first {
-  margin-top: 20rpx;
-}
-.preferenceC .list {
-  padding: 0 60rpx;
-}
-.preferenceC .list .item {
-  background-color: #FBFBFD;
-  margin: 0 14rpx 12rpx 0;
-  width: calc((100% - 28rpx)/3);
-  line-height: 76rpx;
-  border: solid 2rpx #EFEFF2;
-  border-radius: 10rpx;
-  font-size: 24rpx;
-  font-weight: 500;
-  color: #555;
-  text-align: center;
-}
-.preferenceC .list .item.select {
-  background-color: #FFE9D9;
-  border: solid 2rpx #F97316;
-}
-.preferenceC .list .item:nth-child(3n) {
-  margin-right: 0;
-}
-.bottomC {
-  left: 0;
-  right: 0;
-  bottom: 73rpx;
-  margin: 0 25rpx;
-}
-.bottomC .btn {
-  line-height: 80rpx;
-  border-radius: 20rpx;
-  font-size: 26rpx;
-  text-align: center;
-}
-.bottomC .pre {
-  background-color: #FFE9D9;
-  width: 226rpx;
-  color: #F97316;
-}
-.bottomC .finish {
-  background-color: #F97316;
-  margin-left: 20rpx;
-  color: white;
-}