[add] NavBar

src/components/NavBar.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <div
+      class="bg-color-red"
+      style="height: 0.7rem; position:fixed; z-index:999; top:0; width: 100%;"
+    >
+      <div
+        class=""
+        style="width: 100%; display: flex; line-height: 0.7rem; font-size: 0.35rem;"
+      >
+        <div
+          class="iconfont icon-xiangzuo"
+          style="color: #FFFFFF; font-size: 0.35rem; padding-left: 10px;"
+          @click="returns"
+        ></div>
+        <div
+          style="color: #FFFFFF; font-weight: 400; flex: auto; text-align: center; padding-right: 30px;"
+        >
+          {{ title }}
+        </div>
+      </div>
+    </div>
+    <div style="height: 0.7rem;"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "NavBar",
+  props: {
+    title: String
+  },
+  data: function() {
+    return {};
+  },
+  mounted: function() {
+    console.log(this.$router);
+  },
+
+  methods: {
+    returns: function() {
+      this.$router.back();
+    }
+  }
+};
+</script>
+
+<style></style>

src/views/order/GoodsReturn.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="apply-return">
+    <NavBar title="申请退款"></NavBar>
     <div
       class="goodsStyle acea-row row-between"
       v-for="cart in orderInfo.cartInfo"
@@ -101,11 +102,13 @@
 import { orderDetail, getRefundReason, postOrderRefund } from "@api/order";
 import { trim, VUE_APP_API_URL } from "@utils";
 import VueCoreImageUpload from "vue-core-image-upload";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "goodsReturn",
   components: {
-    VueCoreImageUpload
+    VueCoreImageUpload,
+    NavBar
   },
   data() {
     return {

src/views/order/Logistics.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="logistics">
+    <NavBar title="快递信息"></NavBar>
     <div
       class="header acea-row row-between row-top"
       v-for="cart in cartInfo"
@@ -57,13 +58,15 @@
 import Recommend from "@components/Recommend";
 import ClipboardJS from "clipboard";
 import { express } from "@api/order";
+import NavBar from "@components/NavBar";
 
 const NAME = "Logistics";
 
 export default {
   name: NAME,
   components: {
-    Recommend
+    Recommend,
+    NavBar
   },
   data: function() {
     return {

src/views/order/MyOrder.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="my-order" ref="container">
+    <NavBar title="订单中心"></NavBar>
     <div class="header bg-color-red">
       <div class="picTxt acea-row row-between-wrapper">
         <div class="text">
@@ -230,6 +231,7 @@ import {
 } from "@libs/order";
 import Loading from "@components/Loading";
 import Payment from "@components/Payment";
+import NavBar from "@components/NavBar";
 import { mapGetters } from "vuex";
 import { isWeixin } from "@utils";
 import GeneralWindow from "@components/GeneralWindow";
@@ -274,7 +276,8 @@ export default {
   components: {
     Loading,
     Payment,
-    GeneralWindow
+    GeneralWindow,
+    NavBar
   },
   computed: mapGetters(["userInfo"]),
   watch: {

src/views/order/OrderDetails.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="order-details">
+    <NavBar title="订单详情"></NavBar>
     <!-- 给header上与data上加on为退款订单-->
     <div
       class="header bg-color-red acea-row row-middle"
@@ -585,6 +586,7 @@ import {
 } from "@libs/order";
 import { wechatEvevt } from "@libs/wechat";
 import GeneralWindow from "@components/GeneralWindow";
+import NavBar from "@components/NavBar";
 
 const NAME = "OrderDetails";
 
@@ -593,7 +595,8 @@ export default {
   components: {
     OrderGoods,
     Payment,
-    GeneralWindow
+    GeneralWindow,
+    NavBar
   },
   props: {},
   data: function() {

src/views/order/OrderSubmission.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="order-submission">
-    <div
-      class="allAddress"
+    <NavBar title="提交订单"></NavBar>
+    <div>
+      <!-- class="allAddress"
       :style="store_self_mention ? '' : 'padding-top: 0.2rem'"
-    >
-      <div class="nav acea-row">
+    > -->
+      <!-- <div class="nav acea-row">
         <div
           class="item font-color-red"
           :class="shipping_type === 0 ? 'on' : 'on2'"
@@ -17,7 +18,7 @@
           @click="addressType(1)"
           v-if="store_self_mention"
         ></div>
-      </div>
+      </div> -->
       <div
         class="address acea-row row-between-wrapper"
         v-if="shipping_type === 0"
@@ -64,7 +65,7 @@
     </div>
     <OrderGoods :evaluate="0" :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
     <div class="wrapper">
-      <div
+      <!-- <div
         class="item acea-row row-between-wrapper"
         @click="couponTap"
         v-if="deduction === false"
@@ -74,7 +75,7 @@
           {{ usableCoupon.coupon_title || "请选择" }}
           <span class="iconfont icon-jiantou"></span>
         </div>
-      </div>
+      </div> -->
       <div class="item acea-row row-between-wrapper" v-if="deduction === false">
         <div>积分抵扣</div>
         <div class="discount">
@@ -372,6 +373,7 @@ import { pay } from "@libs/wechat";
 import { isWeixin } from "@utils";
 import { mapGetters } from "vuex";
 import cookie from "@utils/store/cookie";
+import NavBar from "@components/NavBar";
 const NAME = "OrderSubmission",
   _isWeixin = isWeixin();
 const LONGITUDE = "user_longitude";
@@ -381,7 +383,8 @@ export default {
   components: {
     OrderGoods,
     CouponListWindow,
-    AddressWindow
+    AddressWindow,
+    NavBar
   },
   props: {},
   computed: {

src/views/order/ReturnList.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="return-list" ref="container">
+    <NavBar title="退款列表"></NavBar>
     <div class="goodWrapper" v-for="order in orderList" :key="order.order_id">
       <div
         class="iconfont icon-tuikuanzhong powder"
@@ -52,11 +53,13 @@
 <script>
 import { getOrderList } from "@api/order";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "ReturnList",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   data() {
     return {

src/views/shop/EvaluateList.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="evaluate-list" ref="container">
+    <NavBar title="用户评价"></NavBar>
     <div class="header">
       <div class="generalComment acea-row row-between-wrapper">
         <div class="acea-row row-middle font-color-red">
@@ -36,6 +37,7 @@
 import UserEvaluation from "@components/UserEvaluation";
 import { getReplyConfig, getReplyList } from "@api/store";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 
 let NAME = "EvaluateList";
 
@@ -43,7 +45,8 @@ export default {
   name: "EvaluateList",
   components: {
     UserEvaluation,
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/shop/GoodSearch.vue

@@ -2,6 +2,11 @@
   <div>
     <div class="searchGood">
       <div class="search acea-row row-between-wrapper">
+        <div
+          class="iconfont icon-xiangzuo"
+          style="color: #000000; font-size: 20px; padding-left: 10px;"
+          @click="returns"
+        ></div>
         <div class="input acea-row row-between-wrapper">
           <span class="iconfont icon-sousuo2"></span>
           <form @submit.prevent="submit"></form>
@@ -67,6 +72,9 @@ export default {
       getSearchKeyword().then(res => {
         this.keywords = res.data;
       });
+    },
+    returns() {
+      history.back();
     }
   }
 };

src/views/shop/GoodsClass.vue

@@ -2,6 +2,11 @@
   <div class="productSort">
     <form @submit.prevent="submitForm">
       <div class="header acea-row row-center-wrapper" ref="header">
+        <router-link
+          to="/"
+          class="iconfont icon-xiangzuo"
+          style="color: #000000; font-size: 20px; padding-left: 5px; padding-right: 15px;"
+        ></router-link>
         <div class="acea-row row-between-wrapper input">
           <span class="iconfont icon-sousuo"></span>
           <input type="text" placeholder="搜索商品信息" v-model="search" />
@@ -146,6 +151,9 @@ export default {
   },
   beforeDestroy: function() {
     document.removeEventListener("scroll", this.onScroll, false);
+  },
+  returns() {
+    history.back();
   }
 };
 </script>

src/views/shop/GoodsCollection.vue

@@ -1,5 +1,6 @@
 <template>
   <div ref="container">
+    <NavBar title="我的收藏"></NavBar>
     <div class="collectionGoods" v-if="collectProductList.length > 0">
       <router-link
         :to="{ path: '/detail/' + item.pid }"
@@ -34,11 +35,13 @@
 import Recommend from "@components/Recommend";
 import { getCollectUser, getCollectDel } from "@api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 export default {
   name: "GoodsCollection",
   components: {
     Recommend,
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/shop/GoodsCon.vue

@@ -8,6 +8,11 @@
       :style="'opacity:' + opacity"
       ref="header"
     >
+      <router-link
+        to="/"
+        class="iconfont icon-xiangzuo"
+        style="color: #000000; font-size: 20px; padding-right: 35px;"
+      ></router-link>
       <div
         class="item"
         :class="navActive === index ? 'on' : ''"
@@ -177,6 +182,10 @@
       </div>
       <user-evaluation :reply="reply" v-if="replyCount"></user-evaluation>
     </div>
+    <div class="product-intro" id="title3">
+      <div class="title">产品介绍</div>
+      <div class="conter" v-html="storeInfo.description"></div>
+    </div>
     <div class="superior" v-if="goodList.length > 0" id="title2">
       <div class="title acea-row row-center-wrapper">
         <img src="@assets/images/ling.png" />
@@ -222,10 +231,6 @@
         </div>
       </template>
     </div>
-    <div class="product-intro" id="title3">
-      <div class="title">产品介绍</div>
-      <div class="conter" v-html="storeInfo.description"></div>
-    </div>
     <div style="height:1.2rem;"></div>
     <div class="footer acea-row row-between-wrapper">
       <div class="item" @click="$router.push({ path: '/customer/list/' + id })">
@@ -283,17 +288,13 @@
       class="generate-posters acea-row row-middle"
       :class="posters ? 'on' : ''"
     >
-      <div
-        class="item"
-        v-if="weixinStatus === true"
-        @click="setShareInfoStatus"
-      >
+      <div class="item" @click="setShareInfoStatus">
         <div class="iconfont icon-weixin3"></div>
         <div class="">发送给朋友</div>
       </div>
       <div class="item" @click="setPosterImageStatus">
-        <div class="iconfont icon-haibao"></div>
-        <div class="">生成海报</div>
+        <div class="iconfont icon-weixin3"></div>
+        <div class="">发送到朋友圈</div>
       </div>
     </div>
     <div
@@ -591,7 +592,7 @@ import { swiper, swiperSlide } from "vue-awesome-swiper";
 import "@assets/css/swiper.min.css";
 import ProductConSwiper from "@components/ProductConSwiper";
 import UserEvaluation from "@components/UserEvaluation";
-import ShareRedPackets from "@components/ShareRedPackets";
+// import ShareRedPackets from "@components/ShareRedPackets";
 import CouponPop from "@components/CouponPop";
 import ProductWindow from "@components/ProductWindow";
 import StorePoster from "@components/StorePoster";
@@ -626,7 +627,6 @@ export default {
     swiperSlide,
     ProductConSwiper,
     UserEvaluation,
-    ShareRedPackets,
     CouponPop,
     ProductWindow,
     StorePoster,
@@ -887,8 +887,14 @@ export default {
       }
     },
     setShareInfoStatus: function() {
-      this.shareInfoStatus = !this.shareInfoStatus;
-      this.posters = false;
+      if (isWeixin()) {
+        this.shareInfoStatus = !this.shareInfoStatus;
+        this.posters = false;
+      } else {
+        this.posters = false;
+        console.log("todo wechat friend");
+        // todo wechat send to friend
+      }
     },
     shareCode: function(value) {
       var that = this;
@@ -898,10 +904,11 @@ export default {
       });
     },
     setPosterImageStatus: function() {
-      var sTop = document.body || document.documentElement;
-      sTop.scrollTop = 0;
-      this.posterImageStatus = !this.posterImageStatus;
+      // var sTop = document.body || document.documentElement;
+      // sTop.scrollTop = 0;
+      // this.posterImageStatus = !this.posterImageStatus;
       this.posters = false;
+      console.log("todo wechat friends");
     },
     //产品详情接口；
     productCon: function() {

src/views/shop/GoodsEvaluate.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="evaluate-con">
+    <NavBar title="商品评价"></NavBar>
     <div class="goodsStyle acea-row row-between" v-if="orderCon.productInfo">
       <div class="pictrue">
         <img :src="orderCon.productInfo.image" class="image" />
@@ -92,13 +93,15 @@ import { trim, VUE_APP_API_URL } from "@utils";
 import { required } from "@utils/validate";
 import VueCoreImageUpload from "vue-core-image-upload";
 import { validatorDefaultCatch } from "@utils/dialog";
+import NavBar from "@components/NavBar";
 
 const NAME = "GoodsEvaluate";
 
 export default {
   name: NAME,
   components: {
-    VueCoreImageUpload
+    VueCoreImageUpload,
+    NavBar
   },
   props: {},
   data: function() {

src/views/shop/GoodsList.vue

@@ -2,6 +2,11 @@
   <div class="productList" ref="container">
     <form @submit.prevent="submitForm">
       <div class="search bg-color-red acea-row row-between-wrapper">
+        <div
+          class="iconfont icon-xiangzuo"
+          style="color: #ffffff; font-size: 20px; padding-right: 10px;  padding-left: 5px;"
+          @click="returns"
+        ></div>
         <div class="input acea-row row-between-wrapper">
           <span class="iconfont icon-sousuo"></span>
           <input placeholder="搜索商品信息" v-model="where.keyword" />
@@ -261,6 +266,9 @@ export default {
     switchTap: function() {
       let that = this;
       that.Switch = !that.Switch;
+    },
+    returns() {
+      this.$router.push({ path: "/" });
     }
   }
 };

src/views/shop/news/NewsDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="newsDetail">
+    <NavBar title="新闻详情"></NavBar>
     <div class="title">{{ articleInfo.title }}</div>
     <div class="list acea-row row-middle">
       <div class="label line1">{{ articleInfo.cart_name }}</div>
@@ -113,11 +114,14 @@ import { getArticleDetails } from "@api/public";
 import ShareInfo from "@components/ShareInfo";
 import { isWeixin } from "@utils/index";
 import { openShareAll } from "@libs/wechat";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "NewsDetail",
   components: { ShareInfo },
-  props: {},
+  props: {
+    NavBar
+  },
   data: function() {
     return {
       articleInfo: {},

src/views/shop/news/NewsList.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="newsList" ref="container">
+    <NavBar title="行业资讯"></NavBar>
     <div class="slider-banner swiperNews" v-if="imgUrls.length > 0">
       <swiper class="swiper-wrapper" :options="swiperNew">
         <swiperSlide
@@ -108,6 +109,7 @@ import {
   getArticleList
 } from "@api/public";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "NewsList",
@@ -116,7 +118,8 @@ export default {
     swiperSlide,
     Tab,
     Tabs,
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/ChangePassword.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="ChangePassword">
+    <NavBar title="修改密码"></NavBar>
     <div class="phone">
       当前手机号:<input type="text" v-model="phone" disabled />
     </div>
@@ -65,10 +66,13 @@ import {
   getCodeApi
 } from "@api/user";
 import { VUE_APP_API_URL } from "@utils";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "ChangePassword",
-  components: {},
+  components: {
+    NavBar
+  },
   props: {},
   data: function() {
     return {

src/views/user/Login.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="register absolute">
+    <div style="text-align: right; padding-right: 10px; padding-top: 8px;">
+      <router-link to="/" style="font-size: 18px; color: white;"
+        >跳过，看好货 ></router-link
+      >
+    </div>
     <div class="shading">
       <div class="pictrue acea-row row-center-wrapper">
         <img :src="logoUrl" v-if="logoUrl" />
@@ -171,7 +176,7 @@
         <span @click="formItem = 1" class="font-color-red">立即登录</span>
       </div>
     </div>
-    <div class="bottom"></div>
+    <!-- <div class="bottom"></div> -->
   </div>
 </template>
 <script>

src/views/user/PersonalData.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="personal-data">
+    <NavBar title="用户中心"></NavBar>
     <div class="wrapper">
       <div class="title">管理我的账号</div>
       <div class="wrapList">
@@ -128,10 +129,13 @@ import { postUserEdit, getLogout, switchH5Login, getUser } from "@api/user";
 import { clearAuthStatus } from "@libs/wechat";
 import cookie from "@utils/store/cookie";
 import store from "@/store";
+import NavBar from "@components/NavBar";
+
 export default {
   name: "PersonalData",
   components: {
-    VueCoreImageUpload
+    VueCoreImageUpload,
+    NavBar
   },
   data: function() {
     return {

src/views/user/Recharge.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="rechargeBox">
+    <NavBar title="充值中心"></NavBar>
     <div class="payment-top acea-row row-column row-center-wrapper">
       <span class="name">我的余额</span>
       <div class="pic">
@@ -7,7 +8,7 @@
       </div>
     </div>
     <div class="recharge">
-      <div class="nav acea-row row-around row-middle">
+      <div class="nav acea-row row-around row-middle" v-show="promoter">
         <div
           class="item"
           :class="active === index ? 'on' : ''"
@@ -80,10 +81,13 @@ import { pay } from "@libs/wechat";
 import { isWeixin } from "@utils";
 import { rechargeWechat, getRechargeApi } from "@api/user";
 import { add, sub } from "@utils/bc";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "Recharge",
-  components: {},
+  components: {
+    NavBar
+  },
   props: {},
   data: function() {
     return {
@@ -97,13 +101,15 @@ export default {
       activePic: 0,
       numberPic: "",
       rechar_id: 0,
-      rechargeAttention: []
+      rechargeAttention: [],
+      promoter: false
     };
   },
   computed: mapGetters(["userInfo"]),
   mounted: function() {
     this.now_money = this.userInfo.now_money;
     this.getRecharge();
+    this.promoter = this.userInfo.is_promoter;
   },
   methods: {
     /**

src/views/user/Register.vue

@@ -49,7 +49,7 @@
         >
       </div>
     </div>
-    <div class="bottom"></div>
+    <!-- <div class="bottom"></div> -->
   </div>
 </template>
 

src/views/user/RetrievePassword.vue

@@ -71,7 +71,7 @@
         >
       </div>
     </div>
-    <div class="bottom"></div>
+    <!-- <div class="bottom"></div> -->
   </div>
 </template>
 

src/views/user/User.vue

@@ -40,10 +40,10 @@
               <div class="num">{{ userInfo.integral || 0 }}</div>
               <div class="name">积分</div>
             </router-link>
-            <router-link :to="'/user/user_coupon'" class="item">
+            <!-- <router-link :to="'/user/user_coupon'" class="item">
               <div class="num">{{ userInfo.couponCount || 0 }}</div>
               <div class="name">优惠券</div>
-            </router-link>
+            </router-link> -->
             <router-link :to="'/order/list'" class="item">
               <div class="num">{{ userInfo.pay_count || 0 }}</div>
               <div class="name">消费订单</div>
@@ -76,9 +76,9 @@
         </div>
       </router-link>
     </div>
-    <router-link :to="'/user/get_coupon'" class="advert"
+    <!-- <router-link :to="'/user/get_coupon'" class="advert"
       ><img src="@assets/images/advert.png"
-    /></router-link>
+    /></router-link> -->
     <div class="wrapper">
       <div class="myOrder">
         <div class="title acea-row row-between-wrapper">
@@ -172,7 +172,7 @@
         </div>
       </div>
     </div>
-    <img src="@assets/images/support.png" class="support" />
+    <!-- <img src="@assets/images/support.png" class="support" /> -->
     <div class="footer-line-height"></div>
     <SwitchWindow
       v-on:changeswitch="changeswitch"

src/views/user/UserAccount.vue

@@ -64,7 +64,7 @@
           <div class="pictrue"><img src="@assets/images/money.png" /></div>
         </router-link>
       </div>
-      <div class="list">
+      <!-- <div class="list">
         <div class="item acea-row row-between-wrapper">
           <div class="picTxt acea-row row-between-wrapper">
             <div class="iconfont icon-hebingxingzhuang"></div>
@@ -113,7 +113,7 @@
           >
           <div class="bnt end" v-else>已结束</div>
         </div>
-      </div>
+      </div> -->
     </div>
     <Recommend></Recommend>
   </div>

src/views/user/UserBill.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="bill-details" ref="container">
+    <NavBar title="账单记录"></NavBar>
     <div class="nav acea-row">
       <div class="item" :class="types == 0 ? 'on' : ''" @click="changeTypes(0)">
         全部
@@ -35,10 +36,12 @@
 <script>
 import { getCommissionInfo } from "../../api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 export default {
   name: "UserBill",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/address/AddAddress.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="addAddress absolute">
+    <NavBar title="添加地址"></NavBar>
     <div class="list">
       <div class="item acea-row row-between-wrapper">
         <div class="name">姓名</div>
@@ -82,10 +83,12 @@ import attrs, { required, chs_phone } from "@utils/validate";
 import { validatorDefaultCatch } from "@utils/dialog";
 import { openAddress } from "@libs/wechat";
 import { isWeixin } from "@utils";
+import NavBar from "@components/NavBar";
 
 export default {
   components: {
-    CitySelect
+    CitySelect,
+    NavBar
   },
   data() {
     return {

src/views/user/address/AddressManagement.vue

@@ -4,6 +4,7 @@
     :class="addressList.length < 1 && page > 1 ? 'on' : ''"
     ref="container"
   >
+    <NavBar title="我的地址"></NavBar>
     <div class="line" v-if="addressList.length > 0">
       <img src="@assets/images/line.jpg" />
     </div>
@@ -76,12 +77,14 @@ import {
   postAddress
 } from "@api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 import { isWeixin } from "@utils";
 import { openAddress } from "@libs/wechat";
 
 export default {
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   data() {
     return {

src/views/user/coupon/UserCoupon.vue

@@ -1,5 +1,6 @@
 <template>
   <div ref="container">
+    <NavBar title="我的优惠券"></NavBar>
     <div class="coupon-list" v-if="couponsList.length > 0">
       <div
         class="item acea-row row-center-wrapper"
@@ -57,11 +58,14 @@
 </template>
 <script>
 import { getCouponsUser } from "@api/user";
+import NavBar from "@components/NavBar";
 const NAME = "UserCoupon";
 
 export default {
   name: "UserCoupon",
-  components: {},
+  components: {
+    NavBar
+  },
   props: {},
   data: function() {
     return {

src/views/user/promotion/CashRecord.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="commission-details" ref="container">
+    <NavBar title="提现记录"></NavBar>
     <div class="promoterHeader bg-color-red">
       <div class="headerCon acea-row row-between-wrapper">
         <div>
@@ -36,11 +37,13 @@
 <script>
 import { getCommissionInfo, getSpreadInfo } from "../../../api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "CashRecord",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/promotion/CommissionDetails.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="commission-details" ref="container">
+    <NavBar title="佣金记录"></NavBar>
     <div class="promoterHeader bg-color-red">
       <div class="headerCon acea-row row-between-wrapper">
         <div>
@@ -36,11 +37,13 @@
 <script>
 import { getCommissionInfo, getSpreadInfo } from "../../../api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "CommissionDetails",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/promotion/Poster.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="distribution-posters">
+    <NavBar title="推广名片"></NavBar>
     <div class="slider-banner banner">
       <swiper class="swiper-wrapper" :options="swiperPosters" ref="mySwiper">
         <swiperSlide
@@ -38,11 +39,13 @@
 import { swiper, swiperSlide } from "vue-awesome-swiper";
 import "@assets/css/swiper.min.css";
 import { getSpreadImg } from "../../../api/user";
+import NavBar from "@components/NavBar";
 export default {
   name: "Poster",
   components: {
     swiper,
-    swiperSlide
+    swiperSlide,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/promotion/PromoterList.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="promoter-list" ref="container">
+    <NavBar title="推广人数"></NavBar>
     <div class="header">
       <div class="promoterHeader bg-color-red">
         <div class="headerCon acea-row row-between-wrapper">
@@ -92,10 +93,12 @@
 <script>
 import { getSpreadUser } from "../../../api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 export default {
   name: "PromoterList",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/promotion/UserCash.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="cash-withdrawal">
+    <NavBar title="佣金提现"></NavBar>
     <div class="nav acea-row">
       <div
         v-for="(item, index) in navList"
@@ -112,10 +113,13 @@
 import { getBank, postCashInfo } from "../../../api/user";
 import { required } from "@utils/validate";
 import { validatorDefaultCatch } from "@utils/dialog";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "UserCash",
-  components: {},
+  components: {
+    NavBar
+  },
   props: {},
   data: function() {
     return {

src/views/user/promotion/UserPromotion.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="my-promotion">
+    <NavBar title="推广中心"></NavBar>
     <div class="header">
       <div class="name acea-row row-center-wrapper">
         <div>当前佣金</div>
@@ -20,6 +21,7 @@
       </div>
     </div>
     <div class="bnt bg-color-red" @click="toCash">立即提现</div>
+    <div class="tips">升级到下级可领取 10000 元</div>
     <div class="list acea-row row-between-wrapper">
       <router-link
         class="item acea-row row-center-wrapper row-column"
@@ -49,7 +51,7 @@
         <span class="iconfont icon-dingdan"></span>
         <div>推广人订单</div>
       </router-link>
-      <router-link
+      <!-- <router-link
         class="item acea-row row-center-wrapper row-column"
         :to="'/user/promoter_rank'"
       >
@@ -62,16 +64,35 @@
       >
         <span class="iconfont icon-paihang"></span>
         <div>佣金排行</div>
-      </router-link>
+      </router-link> -->
     </div>
   </div>
 </template>
+<style>
+.my-promotion .tips {
+  width: 100%;
+  text-align: center;
+  margin-top: 0.25rem;
+  margin-left: 0.2rem;
+  color: red;
+  border-radius: 0.2rem;
+  background-color: white;
+  width: 7.1rem;
+  height: 1rem;
+  line-height: 1rem;
+  color: #ff1f44;
+  font-weight: bold;
+}
+</style>
 <script>
 import { getUser } from "../../../api/user";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "UserPromotion",
-  components: {},
+  components: {
+    NavBar
+  },
   props: {},
   data: function() {
     return {

src/views/user/signIn/Integral.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="integral-details" ref="container">
+    <NavBar title="我的积分"></NavBar>
     <div class="header">
       <div class="currentScore">当前积分</div>
       <div>{{ info.integral }}</div>
@@ -73,10 +74,12 @@
 <script>
 import { getIntegralList, postSignUser } from "../../../api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 export default {
   name: "Integral",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {

src/views/user/signIn/Sign.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="sign">
+    <NavBar title="每日签到"></NavBar>
     <div class="header bg-color-red">
       <div class="headerCon acea-row row-between-wrapper">
         <div class="left acea-row row-between-wrapper">
@@ -110,10 +111,13 @@ import {
   getSignList
 } from "@api/user";
 import { add } from "@utils/bc";
+import NavBar from "@components/NavBar";
 
 export default {
   name: "Sign",
-  components: {},
+  components: {
+    NavBar
+  },
   props: {},
   data: function() {
     return {

src/views/user/signIn/SignRecord.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="sign-record" ref="container">
+    <NavBar title="签到记录"></NavBar>
     <div class="list">
       <div class="item" v-for="(item, index) in signList" :key="index">
         <div class="data">{{ item.month }}</div>
@@ -24,10 +25,12 @@
 <script>
 import { getSignMonth } from "@api/user";
 import Loading from "@components/Loading";
+import NavBar from "@components/NavBar";
 export default {
   name: "SignRecord",
   components: {
-    Loading
+    Loading,
+    NavBar
   },
   props: {},
   data: function() {