1

2 months ago · 79d992ba8b
parent 0b9c37b446
commit 79d992ba8b
6 changed files with 171 additions and 9 deletions
--- a/pages.json
+++ b/pages.json
@ -376,11 +376,19 @@
    },
 	{
 	  "path": "pages/xieyi/index",
+	  "style": {
+	    "navigationBarTitleText": "隐私政策",
+	    "enablePullDownRefresh": false
+	  }
+	},
+	{
+	  "path": "pages/xieyi/about",
 	  "style": {
 	    "navigationBarTitleText": "关于我们",
 	    "enablePullDownRefresh": false
 	  }
 	},
+	
    {
      "path": "pages/live/index",
      "style": {
--- a/pages/checkout/cashier/index.vue
+++ b/pages/checkout/cashier/index.vue
@ -18,12 +18,22 @@
    <view class="payment-method">
      <view v-for="(item, index) in methods" :key="index" class="pay-item dis-flex flex-x-between" @click="handleSelectPayType(index)">
        <view class="item-left dis-flex flex-y-center">
-          <view class="item-left_icon" :class="[item.method]">
+			
+          <view class="item-left_icon" :class="[item.method]" v-if="item.method!='point'">
            <text class="iconfont" :class="[PayMethodIconEnum[item.method]]"></text>
          </view>
-          <view class="item-left_text">
+          <view class="item-left_text" v-if="item.method!='point'">
            <text>{{ PayMethodEnum[item.method].name }}</text>
          </view>
+		  <view class="item-left_icon" :class="[item.method]" v-if="item.method=='point'">
+		    <text class="iconfont" :class="[PayMethodIconEnum[item.method]]"></text>
+		  </view>
+		  <view class="item-left_text" v-if="item.method=='point'">
+		    <text>{{ PayMethodEnum[item.method].name }}</text>
+			<view class="pointInfo">
+				当前可用积分：{{personal.points}}，可抵￥0.95
+			</view>
+		  </view>
          <view v-if="item.method === PayMethodEnum.BALANCE.value" class="user-balance">
            <text>(可用￥{{ personal.balance }}元)</text>
          </view>
@ -535,4 +545,11 @@
    }

  }
+  .pointInfo{
+	  margin-top:14rpx;
+	  font-family: Source Han Sans SC;
+	  font-weight: 400;
+	  font-size: 24rpx;
+	  color: #999999;
+  }
 </style>
--- a/pages/checkout/index.vue
+++ b/pages/checkout/index.vue
@ -46,12 +46,13 @@

        <!-- 上门自提：自提门店 -->
        <block v-if="curDelivery == DeliveryTypeEnum.EXTRACT.value">
-          <view class="flow-delivery" @click="onSelectExtractPoint()">
+          <!-- <view class="flow-delivery" @click="onSelectExtractPoint()"> -->
+          <view class="flow-delivery">
            <view class="flow-delivery__detail dis-flex flex-y-center">
              <view class="detail-location dis-flex">
                <text class="iconfont icon-dingwei"></text>
              </view>
-              <view class="detail-content flex-box">
+              <!-- <view class="detail-content flex-box">
                <block v-if="order.extractShop.shop_id">
                  <view class="detail-content__title dis-flex">
                    <text class="f-30">{{ order.extractShop.shop_name }}</text>
@ -66,10 +67,26 @@
                    <text class="col-6">请选择自提点</text>
                  </view>
                </block>
-              </view>
-              <view class="detail-arrow dis-flex">
+              </view> -->
+			  <view class="detail-content flex-box">
+			    <block>
+			      <view class="detail-content__title dis-flex" style="align-items: center;">
+			        <text class="f-30">{{ order.ziti_address.name }}</text>
+					<text style="margin-left:20rpx;">
+						{{ order.ziti_address.phone }}
+					</text>
+			      </view>
+			      <view class="detail-content__describe">
+			        <!-- <text class="col-7">{{ order.extractShop.region.province }} {{ order.extractShop.region.city }}</text>
+			        <text class="col-7">{{ order.extractShop.region.region }} {{ order.extractShop.address }}</text> -->
+					{{ order.ziti_address.full_address }}
+			      </view>
+			    </block>
+			   
+			  </view>
+             <!-- <view class="detail-arrow dis-flex">
                <text class="iconfont icon-arrow-right user-orderJtou"></text>
-              </view>
+              </view> -->
            </view>
          </view>
          <!-- 自提联系方式 -->
@ -411,6 +428,7 @@
        app.order = order
        app.personal = personal
        app.setting = setting
+		app.selectedShopId = order.ziti_address.address_id
        // 显示错误信息
        if (order.hasError) {
          app.showToast(order.errorMsg, 3000)
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@ -11,6 +11,8 @@
          <!-- 商品售价 -->
          <text class="floor-price__samll">￥</text>
          <text class="floor-price">{{ goods.goods_price_min }}</text>
+          <text class="giftContent" v-if="goods.is_points_gift_yaoqingren">1&{{ goods.is_points_gift_yaoqingren }}</text>
+		  
          <!-- 会员价标签 -->
          <view v-if="goods.is_user_grade" class="user-grade">
            <text>会员价</text>
@ -336,4 +338,17 @@
 </style>
 <style lang="scss" scoped>
  @import "./detail.scss";
+  .giftContent{
+	  background: #F9260B;
+	  border-radius: 17px;
+	  /* width: 41px; */
+	  /* height: 14px; */
+	  font-family: Source Han Sans SC;
+	  font-weight: 400;
+	  font-size: 18rpx;
+	  color: #FFFFFF;
+	  text-align: center;
+	  line-height: 33rpx;
+	  padding: 4rpx 15rpx;
+  }
 </style>
--- a/pages/points/log.vue
+++ b/pages/points/log.vue
@ -5,7 +5,7 @@
 	  <view class="totalPoint">
 	  	<image src="../../static/pointbg.png" mode="widthFix"></image>
 		<view class="pointInfo">
-			<view>9580</view>
+			<view>{{point}}</view>
 			<text>当前积分</text>
 		</view>
 	  </view>
@ -35,13 +35,18 @@
  import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins'
  import * as LogApi from '@/api/points/log'
  import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
-
+  import { checkLogin, filterModule } from '@/core/app'
+  import * as UserApi from '@/api/user'
  const pageSize = 15

  export default {
    mixins: [MescrollMixin],
    data() {
      return {
+		  // 当前用户信息
+		  userInfo: {},
+		   isLogin: false,
+		   point:0,
        // 充值记录
        list: getEmptyPaginateObj(),
        // 上拉加载配置
@ -64,8 +69,43 @@
     * 生命周期函数--监听页面加载
     */
    onLoad(options) {},
+	onShow() {
+		this.getUserInfo()
+		this.upCallback(1)
+		// this.isLogin = checkLogin()
+		
+	},

    methods: {
+		getUserInfo() {
+		  const app = this;
+		  UserApi.info({}, { load: app.isFirstload }).then(result => {
+			  console.log(result,"99")
+			  this.point = result.data.userInfo.points
+		    
+		  })
+		  .catch(err => {
+		    if (err.result && err.result.status == 401) {
+		  	app.isLogin = false
+		     
+		    }
+		  })
+		  // return new Promise((resolve, reject) => {
+		  //   !app.isLogin ? resolve(null) : UserApi.info({}, { load: app.isFirstload })
+		  //     .then(result => {
+		  //       app.userInfo = result.data.userInfo
+		  //       resolve(app.userInfo)
+		  //     })
+		  //     .catch(err => {
+		  //       if (err.result && err.result.status == 401) {
+		  //         app.isLogin = false
+		  //         resolve(null)
+		  //       } else {
+		  //         reject(err)
+		  //       }
+		  //     })
+		  // })
+		},

      /**
       * 上拉加载的回调 (页面初始化时也会执行一次)
--- a/pages/xieyi/about.vue
+++ b/pages/xieyi/about.vue
@ -0,0 +1,64 @@
+<template>
+<view class="xieyi">
+	<image :src="obj.store_image_url" mode="widthFix"></image>
+	<view class="title">
+		{{obj.store_name}}
+	</view>
+	<view class="">
+		{{obj.describe}}
+	</view>
+	<!-- <u-parse :html="obj.describe"></u-parse> -->
+</view>
+</template>
+
+<script>
+import StoreApi from '@/api/store'
+export default{
+	data(){
+		return{
+			
+			obj:{
+				store_image_url:'',
+				store_name:'',//  名称标题
+				describe:'', //介绍
+			}
+		}
+	},
+	methods:{
+		
+	},
+	onLoad(option) {
+		StoreApi.data().then(result => {
+		  console.log(result,"lkjh")
+		  this.obj.store_image_url = result.data.storeInfo.store_image_url;
+		  this.obj.store_name = result.data.storeInfo.store_name;
+		  this.obj.describe = result.data.storeInfo.describe;
+		 //  if(option.id==1){
+		 //  	uni.setNavigationBarTitle({
+		 //  	  title: '用户协议' // 页面标题文本
+		 //  	});
+			// this.content = result.data.storeInfo.YHXY
+		 //  }else if(option.id==2){
+		 //  	uni.setNavigationBarTitle({
+		 //  	  title: '隐私政策' // 页面标题文本
+		 //  	});
+			// this.content = result.data.storeInfo.YSZC
+		 //  }
+		})
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.xieyi{
+	padding:24rpx;
+	image{
+		width:100%;
+		height:auto;
+	}
+	.title{
+		font-size:32rpx;
+		padding:10rpx 0;
+	}
+}
+</style>