修改积分相关接口

common/api/index/index.js

@@ -32,7 +32,7 @@ export const userdict = (data) => {
 // 获取当前店铺会员开通配置信息
 export const getMemberConfig = (data) => {
 	return request({
-		url: '/market/user/member/config',
+		url: '/account/user/member/config',
 		method: 'GET',
 		data: data,
 		toast: false

common/api/market/points.js

@@ -4,7 +4,7 @@ import {prveUrl} from './config.js'
 
 export const pointsShopList = (data) => {
 	return request({
-		url: prveUrl + '/user/shopUser/pointsShopList',
+		url: prveUrl + '/user/point/shopList',
 		method: 'get',
 		data: data
 	})

common/api/member.js

@@ -99,7 +99,7 @@ export const APIshopUsermoneyRecord = (data) => {
 //获取积分明细
 export const APIshopUserpointsRecord = (data) => {
 	return request({
-		url: urlAccount + '/user/shopUser/pointsRecord',
+		url: urlMarket + '/user/point/userRecord',
 		method: 'get',
 		data: data
 	})

common/api/order/pointGoods.js

@@ -0,0 +1,24 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+const url = '/order'
+
+let platformType = '';
+let payType='';
+// #ifdef MP-WEIXIN
+platformType = 'wechat'
+payType='wechatPay'
+// #endif
+// #ifdef MP-ALIPAY
+platformType = 'alipay'
+payType='aliPay'
+// #endif
+
+//订单列表
+export const pointGoodsPage = (data) => {
+    return request({
+        url: url + '/user/pointGoods/page',
+        method: 'get',
+        data: data
+    })
+}
+

pages/index/indexs.vue

@@ -1,17 +1,28 @@
 <template>
-	<view class="content">
+  <view class="content min-page bg-f7">
     <view class="contentbox">
       <template v-if="shopExtend.length">
-				<image class="bg" :src="shopExtend[0].value" mode="aspectFill" v-if="!isJsonArrayString(shopExtend[0].value)"></image>
+        <image
+          class="bg"
+          :src="shopExtend[0].value"
+          mode="aspectFill"
+          v-if="!isJsonArrayString(shopExtend[0].value)"
+        ></image>
         <swiper class="swiper" autoplay circular v-else>
-					<swiper-item class="swiper-item" v-for="item in JSON.parse(shopExtend[0].value)">
+          <swiper-item
+            class="swiper-item"
+            v-for="item in JSON.parse(shopExtend[0].value)"
+          >
             <image class="swiper-bg" :src="item"></image>
           </swiper-item>
         </swiper>
       </template>
       <view class="contentboxitem flex-between">
         <view class="contentboxitemleft flex-colum" @click="scanCodehandle(0)">
-					<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xdiancan.png" mode="aspectFill"></image>
+          <image
+            src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xdiancan.png"
+            mode="aspectFill"
+          ></image>
           <text class="contentboxitemlefttextone">点餐</text>
           <text class="contentboxitemlefttexttow">在线点不排队</text>
         </view>
@@ -19,7 +30,10 @@
           <!-- 	<view class="contentboxitemright_item flex-between"
 						@click="memberindex('user/member/memberdetails')"> -->
           <view class="contentboxitemright_item flex-between" @click="tomember">
-						<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xvip.png" mode="aspectFill"></image>
+            <image
+              src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xvip.png"
+              mode="aspectFill"
+            ></image>
             <view class="contentboxitemright_itembox flex-colum">
               <text>会员</text>
               <text>入会享权益</text>
@@ -29,7 +43,10 @@
 					@click="memberindex('user/member/index')"
 					> -->
           <view class="contentboxitemright_item flex-between" @click="toCharge">
-						<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xchong.png" mode="aspectFill"></image>
+            <image
+              src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/Xchong.png"
+              mode="aspectFill"
+            ></image>
             <view class="contentboxitemright_itembox flex-colum">
               <text>充值</text>
               <text>充值享更多优惠</text>
@@ -38,7 +55,23 @@
         </view>
       </view>
     </view>
-		<u-popup :show="popupShow" :safe-area-inset-bottom="false" mode="center" @close="popupShow = false">
+
+    <view class="u-flex menus u-font-32 color-333">
+      <view class="menu-item" @click="toIntegralMall">
+        <view>积分商城</view>
+        <view class="u-font-24 color-999">攒积分，兑换更多优惠</view>
+      </view>
+      <view class="menu-item" @click="toFenxiao">
+        <view>分销</view>
+        <view class="u-font-24 color-999">邀请好友，获得佣金</view>
+      </view>
+    </view>
+    <u-popup
+      :show="popupShow"
+      :safe-area-inset-bottom="false"
+      mode="center"
+      @close="popupShow = false"
+    >
       <view class="popup-content">
         <view class="header-wrap">
           <text class="t">请选择</text>
@@ -48,10 +81,18 @@
         </view>
         <view class="btn-content">
           <view class="btn">
-						<u-button color="#E8AD7B" plain="" shape="circle" @click="beforehandOrderHandle">预点单</u-button>
+            <u-button
+              color="#E8AD7B"
+              plain=""
+              shape="circle"
+              @click="beforehandOrderHandle"
+              >预点单</u-button
+            >
           </view>
           <view class="btn">
-						<u-button color="#E8AD7B" shape="circle" @click="scanOrderHandle">扫码点单</u-button>
+            <u-button color="#E8AD7B" shape="circle" @click="scanOrderHandle"
+              >扫码点单</u-button
+            >
           </view>
         </view>
       </view>
@@ -60,19 +101,33 @@
 </template>
 
 <script setup>
-import { getMemberConfig, getRechargeConfig } from '@/common/api/index/index.js';
+import {
-import { ref, reactive, defineProps, defineEmits, onMounted } from 'vue';
+  getMemberConfig,
-import { isJsonArrayString } from '@/utils/util.js';
+  getRechargeConfig,
+} from "@/common/api/index/index.js";
+import { ref, reactive, defineProps, defineEmits, onMounted } from "vue";
+import { isJsonArrayString } from "@/utils/util.js";
 
 // 定义接收的属性
 const props = defineProps({
   shopExtend: {
     type: Array,
-		default: []
+    default: [],
-	}
+  },
 });
+function toFenxiao() {
+  uni.navigateTo({
+    url: "/distribution/shop-detail/index?shopId="+uni.cache.get("shopId"),
+  });
+}
 
-import { productStore } from '@/stores/user.js';
+function toIntegralMall() {
+  uni.navigateTo({
+    url: "/scoreShop/index/index",
+  });
+}
+
+import { productStore } from "@/stores/user.js";
 
 // 显示弹窗
 const popupShow = ref(false);
@@ -83,11 +138,11 @@ const scanCodehandle = (i) => {
 // 预点单
 function beforehandOrderHandle() {
   popupShow.value = false;
-	let shopUserInfo = uni.cache.get('shopUserInfo');
+  let shopUserInfo = uni.cache.get("shopUserInfo");
-	uni.cache.set('dinersNum', 1);
+  uni.cache.set("dinersNum", 1);
-	uni.cache.set('tableCode', shopUserInfo.id);
+  uni.cache.set("tableCode", shopUserInfo.id);
   uni.navigateTo({
-		url: '/pages/product/index?type=beforehand'
+    url: "/pages/product/index?type=beforehand",
   });
 }
 
@@ -100,48 +155,48 @@ async function scanOrderHandle() {
 
 const memberindex = (url) => {
   uni.pro.navigateTo(url, {
-		shopId: uni.cache.get('shopId'),
+    shopId: uni.cache.get("shopId"),
-		type: 'index'
+    type: "index",
   });
 };
 
 function tomember() {
   if (isMember.value) {
-		const shopUserInfo = uni.cache.get('shopUserInfo') || {};
+    const shopUserInfo = uni.cache.get("shopUserInfo") || {};
-		const shopId = uni.cache.get('shopId');
+    const shopId = uni.cache.get("shopId");
     if (!shopUserInfo.isVip) {
       uni.navigateTo({
-				url: '/user/vip/buy-vip?shopId=' + shopId
+        url: "/user/vip/buy-vip?shopId=" + shopId,
       });
       return;
     }
     uni.navigateTo({
-			url: '/user/vip/vip?shopId=' + shopId
+      url: "/user/vip/vip?shopId=" + shopId,
     });
   } else {
     uni.showToast({
-			title: '暂未开放',
+      title: "暂未开放",
-			icon: 'none'
+      icon: "none",
     });
   }
 }
 
 function toCharge() {
   if (isCharge.value) {
-		const shopId = uni.cache.get('shopId');
+    const shopId = uni.cache.get("shopId");
     uni.navigateTo({
-			url: '/pages/user/member/czzx?shopId=' + shopId
+      url: "/pages/user/member/czzx?shopId=" + shopId,
     });
   } else {
     uni.showToast({
-			title: '暂未开放',
+      title: "暂未开放",
-			icon: 'none'
+      icon: "none",
     });
   }
 }
 const getQueryString = (url, name) => {
   //解码
-	var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i');
+  var reg = new RegExp("(^|&|/?)" + name + "=([^&|/?]*)(&|/?|$)", "i");
   var r = url.substr(1).match(reg);
   if (r != null) {
     return r[2];
@@ -154,8 +209,8 @@ const isMember = ref(0);
 const isCharge = ref(0);
 async function getVipConfig() {
   try {
-		const res1 = await getMemberConfig({ shopId: uni.cache.get('shopId') });
+    const res1 = await getMemberConfig({ shopId: uni.cache.get("shopId") });
-		const res2 = await getRechargeConfig({ shopId: uni.cache.get('shopId') });
+    const res2 = await getRechargeConfig({ shopId: uni.cache.get("shopId") });
 
     isMember.value = +res1.memberConfig.isOpen;
     isCharge.value = +res2.isEnable;
@@ -169,7 +224,7 @@ onMounted(() => {
 });
 
 defineExpose({
-	getVipConfig
+  getVipConfig,
 });
 </script>
 
@@ -312,4 +367,19 @@ page {
     }
   }
 }
+
+.menus {
+  display: flex;
+  padding: 32rpx 40rpx;
+  margin-top: 150rpx;
+  gap: 20rpx;
+  .menu-item {
+    background-color: #fff;
+    border-radius: 16rpx;
+    text-align: center;
+    padding: 32rpx 28rpx;
+    box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0, 0, 0, 0.16);
+    flex: 1;
+  }
+}
 </style>

pages/user/member/list.vue

@@ -41,7 +41,7 @@
 	import {
 		APIusershopUservipCard
 	} from '@/common/api/member.js'
-	import * as vipApi from '@/common/api/market/vip.js'
+	import * as vipApi from '@/common/api/account/vip.js'
 	
 
 	const orderForm = reactive({

pages/user/user.vue

@@ -255,9 +255,11 @@ import devetools from "@/components/devetools.vue";
 import { ref, computed, onMounted, reactive, watch } from "vue";
 import { onLoad, onReady, onShow } from "@dcloudio/uni-app";
 import { productStore } from "@/stores/user.js";
-import * as vipApi from "@/common/api/market/vip.js";
+import * as vipApi from "@/common/api/account/vip.js";
 import * as rechargeApi from "@/common/api/market/recharge.js";
-import { pointsShopList } from "@/common/api/account/points.js";
+import { pointsShopList } from '@/common/api/market/points.js'
+
+
 
 function qrcodeResult(res) {
   qrcode.value = res;

scoreShop/index/index.vue

@@ -5,6 +5,7 @@
       bgColor="transparent"
       leftIconColor="#333"
       titleStyle="color:#333"
+      @leftClick="back"
     ></up-navbar>
     <view :style="{ backgroundImage: 'url(' + imgs.bg + ')' }" class="bg">
       <view class="top">
@@ -22,7 +23,7 @@
             </view>
           </view>
           <view class="u-m-t-10 u-flex color1" style="margin-left: 66rpx">
-            <text>积分订单</text>
+            <text @click="toPage('/scoreShop/order/index')">积分订单</text>
             <text class="u-m-l-44">积分明细</text>
           </view>
         </view>
@@ -48,7 +49,7 @@
           >
         </view>
         <view class="u-flex" @click="toggleLayout">
-          <image :src="imgs.layout" class="layout" />
+          <image :src="layout === 'block' ? imgs.layout_block : imgs.layout" class="layout" />
         </view>
       </view>
       <goodsList :layout="layout"></goodsList>
@@ -56,6 +57,7 @@
   </view>
 </template>
 <script setup>
+import * as pointGoodsApi from "@/common/api/order/pointGoods.js";
 import goodsList from "./components/goods-list.vue";
 const imgs = {
   bg: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/3716211a58d84fda9ee596a1882c0704.png", //背景图
@@ -65,14 +67,40 @@ const imgs = {
     "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/d53e8d88462d4d838b12150062644d03.png", //五角星
   layout:
     "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/2/cba40ceb38a64bbfbe144f2ab0d6197f.png", //布局
+    layout_block:
+    "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/57a51ee2c74d4a638db2a81c6f6c8954.png",
 };
 const layout = ref("block");
 
 function toggleLayout() {
   layout.value = layout.value === "block" ? "list" : "block";
 }
+function back() {
+  uni.navigateBack({
+    delta: 1,
+  });
+}
 
+function toPage(url) {
+  uni.navigateTo({
+    url: url,
+  });
+}
 const tabActive = ref(0);
+const query = reactive({
+  page: 1,
+  size: 10,
+  shopId: uni.cache.get("shopId"),
+});
+const isEnd = ref(false);
+function getList() {
+  pointGoodsApi.pointGoodsPage(query);
+}
+onShow(() => {
+  query.page = 1;
+  isEnd.value = false;
+  getList();
+});
 </script>
 <style scoped lang="scss">
 .bg {

user/score/list.vue

@@ -23,7 +23,7 @@
 <script setup>
 	import {
 		pointsShopList
-	} from '@/common/api/account/points.js'
+	} from '@/common/api/market/points.js'
 	import {
 		onMounted,
 		reactive,

user/vip/buy-vip.vue

@@ -153,7 +153,7 @@
 		joinMember,
 		ltPayMember
 	} from '@/common/api/order/index.js'
-	import * as vipApi from '@/common/api/market/vip.js'
+	import * as vipApi from '@/common/api/account/vip.js'
 	import {pay} from '@/utils/pay.js'
 	import {
 		APIusershopInfodetail,APIshopUserInfo

user/vip/vip.vue

@@ -83,7 +83,7 @@
 	import {
 		onLoad
 	} from '@dcloudio/uni-app';
-	import * as vipApi from '@/common/api/market/vip.js';
+	import * as vipApi from '@/common/api/account/vip.js';
 	import {
 		APIusershopInfodetail,
 		APIshopUserInfo