原始股明细

src/pages.json

@@ -449,6 +449,12 @@
 						"navigationBarTitleText": "TeaC明细"
 					}
 				},
+				{
+					"path": "accountDetails/OriginalShares",
+					"style": {
+						"navigationBarTitleText": "原始股明细"
+					}
+				},
 				{
 					"path": "order/verificationCode",
 					"style": {

src/pages/my/index.vue

@@ -86,7 +86,7 @@
                             <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
                         <p class="dinB">{{userinfo.cha_bao||0}}</p>
                     </div>
-                    <div class="i_num flex_c flex_ae mar_t30">
+                    <div class="i_num flex_c flex_ae mar_t30" @click="goto('/pagesB/accountDetails/OriginalShares')">
                         <p class="flex_r flex_ac flex_jc">
                             <image src="/static/wallet/5.png" class="ico" /><span>原始股</span></p>
                         <p class="dinB">{{localInfo.original_equity || 0}}</p>

src/pagesB/accountDetails/OriginalShares.vue

@@ -0,0 +1,216 @@
+<template>
+    <view class="container">
+        <!-- 积分列表 -->
+        <view class="con">
+            <view class="list" v-for="(item, index) in list" :key="index">
+                <view class="list_head flex_r flex_ac flex_jb">
+                    <view :class="['head_price',item.act == '+' ? 'g_color' : '']">{{item.act}}{{ item.num }}</view>
+                    <!-- <view class="head_name">{{ item.remark }}</view> -->
+                </view>
+                <view class="list_con flex_r flex_ac flex_jb">
+                    <view class="list_balance">{{ item.create_time }}</view>
+                    <view class="list_time">原始股余额{{ item.after }}</view>
+                </view>
+            </view>
+            <not-goods v-if="haveGoods" textStr="暂无明细"></not-goods>
+        </view>
+        <!-- 积分列表 -->
+    </view>
+</template>
+<script>
+let page = 1;
+import { post } from "@/request/api.js";
+import notGoods from "@/components/not-goods/index.vue";
+export default {
+    components: {
+        notGoods,
+    },
+    data() {
+        return {
+            haveGoods: false, // 是否有商品
+            current: 0,
+            TabList: [
+                { title: "全部", sauts: 0 },
+                // { title: "收益", sauts: 1 },
+                // { title: "支出", sauts: 2 },
+            ],
+            list: [],
+            page: 1,
+        };
+    },
+    onShow() {
+        this.page = 1;
+        page=1
+        this.list = [];
+        this.loadData();
+    },
+    methods: {
+        loadData: function() {
+            let that = this;
+            let data = {
+                type: this.current == 0 ? "" : this.current,
+                page: page,
+                limit: 10,
+            };
+            uni.showLoading({ mask: true });
+            post("v1/my/equity", data).then((res) => {
+                uni.hideLoading();
+                if (res.code === 0) {
+                    if (res.data.data.data.length > 0) {
+                        this.list = this.list.concat(res.data.data.data);
+                    } else {
+                        if (this.page == 1) {
+                            this.haveGoods = true;
+                            this.page = -1;
+                        } else {
+                            this.page = -1;
+                            this.$toast("暂无更多");
+                        }
+                    }
+                } else {
+                    if (page == 1) {
+                        this.haveGoods = true;
+                        this.page = -1;
+                    } else {
+                        this.page = -1;
+                        this.$toast("暂无更多");
+                    }
+                }
+            });
+        },
+        SetStatus(i) {
+            this.current = i;
+            page = 1;
+            this.list = [];
+            this.haveGoods = false;
+            this.loadData();
+        },
+    },
+    computed: {
+        type() {
+            return (va) => {
+                switch (va) {
+                    case 0:
+                        return "收货发放TeaC";
+                    case 1:
+                        return "分享消费发放奖励";
+                    case 2:
+                        return "转介绍消费发放奖励";
+                    case 3:
+                        return "平台发放TeaC";
+                    case 4:
+                        return "收到赠送TeaC";
+                    case 5:
+                        return "赠送支出TeaC";
+                    case 6:
+                        return "兑换支出TeaC";
+                    case 7:
+                        return "寄卖奖励TeaC";
+                    case 8:
+                        return "取消订单返还";
+                    default:
+                        return "";
+                }
+            }
+        }
+    },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+        if (page != -1) {
+            var that = this;
+            setTimeout(function() {
+                ++page;
+                that.loadData();
+            }, 800);
+        }
+    },
+};
+</script>
+<style lang="scss">
+// 页面配置
+// 页面配置-end
+
+// 顶部列表
+.tab_list {
+    height: 100%;
+    box-sizing: border-box;
+    font-size: 30rpx;
+    color: #808080;
+}
+
+.Tab_con {
+    width: 100%;
+    height: 92rpx;
+    background: #fff;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.active {
+    color: #1bbd89;
+    border-bottom: 6rpx solid #1bbd89;
+}
+
+// 顶部列表-end
+
+// 资金列表
+.list_con {
+    width: 100%;
+    overflow: hidden;
+}
+
+.list_head {
+    width: 100%;
+    overflow: hidden;
+}
+
+.list_time {
+    font-size: 24rpx;
+    color: #a1a1a1;
+}
+
+.list_balance {
+    font-size: 24rpx;
+    color: #a1a1a1;
+}
+
+.head_price {
+    font-size: 32rpx;
+    font-family: "SourceHanSansCN-Medium";
+}
+
+.head_name {
+    font-size: 30rpx;
+    color: #212121;
+    font-family: "SourceHanSansCN-Medium";
+}
+.con{
+    padding: 0 30rpx;
+}
+.list {
+    width: 100%;
+    overflow: hidden;
+    padding: 30rpx;
+    box-sizing: border-box;
+    // border-bottom: 3rpx solid #f4f4f4;
+    border-radius: 12rpx;
+    background-color: #fff;
+    margin-top: 32rpx;
+    background-color: #fff;
+}
+
+// 资金列表-end
+
+// 状态颜色
+.g_color {
+    color: #1bbd89;
+}
+
+.y_color {
+    color: #f15b21;
+}
+
+// 状态颜色-end
+</style>./OriginalShares.vue

src/pagesB/orderingfood/orderlist.vue

@@ -73,7 +73,7 @@
                     </div>
                     <div class="p2 flex_r flex_jb">
                         <div class="goods good2 ">金额</div>
-                        <div class="g_amount"><span class="amount dinB">{{ i.balance_amount }}</span></div>
+                        <div class="g_amount"><span class="amount dinB">{{ i.order_amount }}</span></div>
                     </div>
                     <div class="p3">订单编号：{{ i.order_no }}</div>
                     <div class="p3 mt-10">下单时间：{{ i.create_time }}</div>

src/pagesC/settledMerchant/merchant.vue

@@ -74,12 +74,14 @@ export default {
     },
     methods: {
         async merchant(){
+            uni.showLoading({ title: '加载中',mask: true });
             let adres = await uni.Location();
             post("v1/merchant/detail", {
                 shop_id: this.shopID,
                 longitude: adres.lng,
                 latitude: adres.lat
             }).then((res) => {
+                uni.hideLoading();
                 if (res.code == 0) {
                     let da = res.data;
                     if(da.atlas) da.atlas = JSON.parse(da.atlas)