1

gasStation-uni/pages/index/index.vue

@@ -90,6 +90,9 @@
 					<view class="juanniu" @click="gooil()">
 						<view class="">一键加油</view>
 					</view>
+
+
+
 				</view>
 				<view style="height: 88px; width: 100%;"></view>
 			</view>

gasStation-uni/pagesHome/PointsMall/PointsMall.vue

@@ -81,25 +81,64 @@
 		</view>
 	</view>
 </template>
-
 <script>
+		import config from '@/config'
+		import request from '../../utils/request';
 	export default {
 		data() {
 			return {
+				categoryList:{},
+				integralGiftList:{},
 				title: '',
 				qhindex: 0,
-
+				query: {
+					categoryId: '',
+					giftName: '',
+					deliveryMethod:'',
+					page: 1,
+					pageSize: 10000
+				}
 
 			}
 		},
 
 		components: {
 
+		},
+		onLoad() {
+			this.getCategoryList();
+			// this.getIntegralGiftList();
 		},
 		methods: {
 			transferIndex(index) {
 				this.qhindex = index
 			},
+			// 获取积分商城分类
+			getCategoryList() {
+				request({
+					url: '/business/integral/integralGiftCategory/queryByPage',
+					method: 'get',
+					params:data
+				}).then((res)=>{
+					if(res.code == 200){
+						console.log("hello world",res)
+					}
+				})
+			},
+			// 获取积分商城列表
+			getIntegralGiftList() {
+				// let
+				request({
+					url: 'business/integral/integralGift/queryByPage',
+					method: 'get',
+					params:data
+				}).then((res)=>{
+					if(res.code == 200){
+						console.log("hello world",res)
+					}
+				})
+			},
+			// 获取个人积分信息
 			gojg(nmb) {
 				if (nmb == 1) {
 					uni.navigateTo({

gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue

@@ -23,7 +23,6 @@
 </template>
 
 <script>
-	import input from '../../uni_modules/uview-ui/libs/config/props/input'
 	export default {
 		data() {
 			return {

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -44,11 +44,11 @@
 			<view class="boxback" style="box-sizing: border-box; padding: 1px; " v-if="actinput == 2 ">
 				<view class="inputbox">
 					<view class="cadname">卡号</view>
-					<input type="text" placeholder="请输入礼品卡卡号" />
+					<!-- 	<input type="text" placeholder="请输入礼品卡卡号" /> -->
 				</view>
 				<view class="inputbox">
 					<view class="cadname">卡密</view>
-					<input type="text" placeholder="请输入礼品卡卡密" />
+					<!-- 	<input type="text" placeholder="请输入礼品卡卡密" /> -->
 				</view>
 			</view>
 			<!-- 底部 -->
@@ -75,7 +75,6 @@
 </template>
 
 <script>
-	import input from '../../uni_modules/uview-ui/libs/config/props/input'
 	export default {
 		data() {
 			return {

gasStation-uni/request/index.js

@@ -1,7 +1,6 @@
 // 同时发送异步代码的次数
 let ajaxTimes = 0;
 export const request = (params) => {
-
 	var openid = wx.getStorageSync("openid") || '';
 	let header = {
 		...params.header