价格分摊 (!638) · Merge Requests · fe / yohobuywap-node

Merged

Merge Request !638 opened 8 years ago by张孝茹 @zhangxiaoru

价格分摊

Edited 8 years ago

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/orderApportion origin/feature/orderApportion

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout release/5.8
git merge --no-ff feature/orderApportion

Step 4. Push the result of the merge to GitLab

git push origin release/5.8

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

The changes were merged into release/5.8. The source branch has been removed.

@chengyao started a discussion on an outdated diff 8 years ago

apps/home/models/order.js

              name: value.product_name,
              color: value.factory_color_name ? value.factory_color_name : value.color_name,
              size: value.size_name,
              price: value.goods_price,
              payPrice: value.real_pay_price,
              salePrice: transPrice(value.sales_price) || value.good,