diff --git a/manifest.json b/manifest.json
index 43987aa..e07e880 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
- "versionName" : "1.1.0",
- "versionCode" : 110,
+ "versionName" : "1.3.0",
+ "versionCode" : 130,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/admin/financial_management/index.vue b/pages/admin/financial_management/index.vue
new file mode 100644
index 0000000..dc31959
--- /dev/null
+++ b/pages/admin/financial_management/index.vue
@@ -0,0 +1,674 @@
+
+
+
+
+
+
+
+ {{ userInfo.nickname }}
+
+
+
+
+
+ {{ userInfo.nickname }}
+
+
+
+
+
+
+
+ 账户总金额(元)
+
+ {{ all_money }}元
+ ****元
+
+
+ 可提现金额{{ userInfo.user_money || 0.0 }}元
+ 可提现金额****元
+
+
+
+
+ 履约保证金额(元)
+ {{
+ userInfo.deposit || 0.0
+ }}
+ ****
+
+
+
+ 个人收益金额(元)
+ {{
+ userInfo.user_money || 0.0
+ }}
+ ****
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 账单日期: {{ current ? item.month : item.create_time }}
+
+
+
+
+ 任务名称：
+ {{ item.remark }}
+
+
+
+
+ 收益来源：
+
+ {{
+ item.type_desc
+ }}
+ {{ item.type_desc }}
+ {{
+ item.type_desc
+ }}
+
+
+
+
+ {{
+ current
+ ? item.expenditure == 0
+ ? "+" + item.income
+ : "-" + item.income
+ : item.change_amount_desc
+ }}
+
+
+
+
+
+
+
+
+
+
+
+ 账单详情
+ 账单日期：{{ item.month }}
+
+
+
+ 个人收益金额(元)
+ {{ item.income }}
+
+
+ 支出金额:{{
+ item.expenditure > 0 ? item.expenditure : "0.00"
+ }}
+ 入账金额:{{ item.income > 0 ? item.income : "0.00" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
new file mode 100644
index 0000000..4014b4e
--- /dev/null
+++ b/pages/users/order_list/relase.vue
@@ -0,0 +1,1313 @@
+
+
+
+
+
+
+ 搜索我的订单
+
+
+
+ 全部
+ {{orderData.orderCount+len || 0}}
+
+
+ 待付款
+ {{orderData.noPay || 0}}
+
+
+ 待发货
+ {{orderData.noPostage || 0}}
+
+
+ 待收货
+ {{orderData.noDeliver || 0}}
+
+
+ 待评价
+ {{orderData.noComment || 0}}
+
+
+ 售后/退款
+ {{len || 0}}
+
+
+
+
+
+
+ 预售尾款订单转到这里了！
+ 有 {{ presellOrderCount }} 笔预售尾款订单待付款，请点击查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.group_order_sn}}
+
+
+ {{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 预售{{goods.cart_info.product.store_name}}
+ 发货时间：
+
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+
+ ￥{{goods.cart_info.productPresellAttr.presell_price}}
+
+ x{{goods.product_num}}
+
+
+
+ 定金待支付 ￥{{ order.pay_price }}
+ 尾款待支付 ￥{{ order.presellOrder.pay_price }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goods.cart_info.product.store_name}}
+
+
+
+
+ ￥{{goods.cart_info.activeSku.active_price}}
+ x{{goods.product_num}}
+
+
+ ￥{{goods.cart_info.productAttr.price}}
+ x{{goods.product_num}}
+
+
+
+
+
+
+
+ 共{{item.total_num || 0}}件商品，总金额
+ ￥{{item.pay_price}}
+
+
+
+ 立即付款
+
+
+
+
+
+
+
+
+
+
+
+ {{item.merchant.mer_name}}
+
+
+
+
+ {{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}
+
+
+
+
+ 待发货
+ 待付款
+ 待收货
+ 待评价
+
+ 已完成
+ 已退款
+ 待结算
+
+ 待商家确认
+
+
+
+
+
+
+
+
+
+
+ 预售{{goods.cart_info.product.store_name}}
+ 发货时间：
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+ {{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+
+
+
+ {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+
+
+
+ ￥{{goods.cart_info.productPresellAttr.presell_price}}
+ x{{goods.product_num}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goods.cart_info.product.store_name}}
+
+
+ {{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+
+
+
+
+ ￥{{goods.cart_info.productAssistAttr.assist_price}}
+ x{{goods.product_num}}
+
+
+
+ ￥{{goods.cart_info.activeSku.active_price}}
+ x{{goods.product_num}}
+
+
+ ￥{{goods.cart_info.productAttr.price}}
+ x{{goods.product_num}}
+
+
+
+
+ 共{{item.orderNum || 0}}件商品，总金额
+ ￥{{item.presell_price}}
+
+ 共{{item.orderNum || 0}}件商品，总金额
+ ￥{{item.pay_price}}
+
+
+
+
+
+ 查看详情
+
+
+ 查看物流
+
+ 确认收货
+
+ 确认收货
+
+
+
+
+
+ 去付款
+
+
+ 去付款
+
+
+
+
+
+ 去付款
+
+
+ 去付款
+
+
+
+
+
+
+ 去结算
+
+
+ 去评价
+
+
+
+
+ 查看详情
+
+ 再次购买
+
+
+
+
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认收到货了吗?
+ 此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。
+
+ 取消
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/images/bubble.png b/static/images/bubble.png
new file mode 100644
index 0000000..3509978
Binary files /dev/null and b/static/images/bubble.png differ
diff --git a/static/images/relase.png b/static/images/relase.png
new file mode 100644
index 0000000..a35dc02
Binary files /dev/null and b/static/images/relase.png differ