create

api/user.js

@@ -156,6 +156,12 @@ export function getIntegralList(q) {
 	return request.get("integral/list", q);
 }
 
+/*
+ * 股权记录
+ * */
+export function getShareList(q) {
+	return request.get("share/list", q);
+}
 /**
  * 获取分销海报图片
  * 

config/app.js

@@ -2,7 +2,7 @@ module.exports = {
 	// 小程序 / APP请求配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
-	HTTP_REQUEST_URL: `https://demo.crmeb.com`,
+	HTTP_REQUEST_URL: `http://zysx.frp.qiniu1314.com`,
 	// #endif
 
 	// H5请求配置

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "CRMEB标准版",
+    "name" : "中雁石斛",
     "appid" : "__UNI__A3F1ED4",
-    "description" : "CRMEB标准版",
+    "description" : "中雁石斛",
     "versionName" : "5.6.2",
     "versionCode" : 562,
     "transformPx" : false,
@@ -217,6 +217,15 @@
     },
     "h5" : {
         "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://zysx.frp.qiniu1314.com/api",
+                    // "changeOrigin": true,
+                    "pathRewrite" : {
+                        "/api" : "" // rewrite path
+                    }
+                }
+            },
             "https" : false
         },
         "router" : {
@@ -240,7 +249,7 @@
         "async" : {
             "timeout" : 200000
         },
-        "title" : "加载中"
+        "title" : "中雁石斛"
     },
     "plus" : {
         "statusbar" : {

pages.json

@@ -641,6 +641,25 @@
 						}
 					}
 				},
+				{
+					"path": "user_integral/guquan",
+					"style": {
+						"navigationBarTitleText": "股权详情"
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "user_coupon/index",
 					"style": {

pages/goods/order_confirm/index.vue

@@ -115,7 +115,7 @@
 					</view>
 				</view>
 				<view class='item acea-row row-between-wrapper'
-					v-if="!pinkId && !BargainId && !combinationId && !seckillId && !advanceId && integral_open">
+					v-if="!pinkId && !BargainId && !combinationId && !seckillId && !advanceId && integral_open && !is_pack">
 					<view>{{$t(`积分抵扣`)}}</view>
 					<view class='discount acea-row row-middle'>
 						<view> {{useIntegral ? $t(`剩余积分`):$t(`当前积分`)}}
@@ -488,7 +488,8 @@
 				integral_open: false,
 				jumpData: {},
 				is_gift: 0, // 1 购买的礼品 2领取礼品
-				giftData: null
+				giftData: null,
+				is_pack: 0//是否报单商品
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -519,6 +520,9 @@
 			if(options.is_gift){
 				this.is_gift = Number(options.is_gift);
 			}
+			if(options.is_pack) {
+				this.is_pack = Number(options.is_pack);
+			}
 			this.couponId = options.couponId || 0;
 			this.noCoupon = Number(options.noCoupon) || 0;
 			this.pinkId = options.pinkId ? parseInt(options.pinkId) : 0;
@@ -907,6 +911,7 @@
 					mask: true
 				});
 				let data = {
+					is_pack:that.is_pack,
 					cartId: that.cartId,
 					new: that.news,
 					addressId: that.addressId,
@@ -1199,6 +1204,7 @@
 					}
 				}
 				data = {
+					is_pack: that.is_pack,
 					custom_form: that.confirm,
 					gift_mark: that.gift_mark, // 礼物留言
 					real_name: that.contacts,

pages/goods_details/index.vue

@@ -307,48 +307,57 @@
 					</view>
 				</view>
 				<view v-else>
-					<view v-if="!storeInfo.presale">
-						<view class="bnt acea-row" :class="!storeInfo.cart_button ? 'virbnt' : ''" v-if="attr.productSelect.stock <= 0">
-							<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''">
-								<button class="joinCart bnts" form-type="submit">
-									{{ $t(`加入购物车`) }}
-								</button>
-							</form>
-							<form class="buy bnts bg-color-hui">
-								<button class="buy bnts bg-color-hui" form-type="submit" :class="!storeInfo.cart_button ? 'virbnt' : ''">
-									{{ $t(`已售罄`) }}
-								</button>
-							</form>
-						</view>
-						<view class="bnt acea-row" v-else>
-							<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts">
-								<button class="joinCart bnts" form-type="submit">
-									{{ $t(`加入购物车`) }}
-								</button>
-							</form>
-							<form @submit="goBuy" class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''">
-								<button class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''" form-type="submit">
-									{{ $t(`立即购买`) }}
-								</button>
-							</form>
-						</view>
-					</view>
-					<view class="presale" v-else>
-						<view class="acea-row" v-if="presale_pay_status === 1 || presale_pay_status === 3">
-							<form class="bnts bg-color-hui">
-								<button class="bnts bg-color-hui" form-type="submit">{{ presale_pay_status === 1 ? $t(`未开始`) : $t(`已结束`) }}</button>
-							</form>
-						</view>
-						<view class="acea-row" v-else-if="attr.productSelect.quota <= 0 || attr.productSelect.quota < attr.productSelect.cart_num">
-							<form class="bnts bg-color-hui">
-								<button class="bnts bg-color-hui" form-type="submit">{{ $t(`已售罄`) }}</button>
-							</form>
+					<template v-if="storeInfo.is_pack == 0">
+						<view v-if="!storeInfo.presale">
+							<view class="bnt acea-row" :class="!storeInfo.cart_button ? 'virbnt' : ''" v-if="attr.productSelect.stock <= 0">
+								<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''">
+									<button class="joinCart bnts" form-type="submit">
+										{{ $t(`加入购物车`) }}
+									</button>
+								</form>
+								<form class="buy bnts bg-color-hui">
+									<button class="buy bnts bg-color-hui" form-type="submit" :class="!storeInfo.cart_button ? 'virbnt' : ''">
+										{{ $t(`已售罄`) }}
+									</button>
+								</form>
+							</view>
+							<view class="bnt acea-row" v-else>
+								<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts">
+									<button class="joinCart bnts" form-type="submit">
+										{{ $t(`加入购物车`) }}
+									</button>
+								</form>
+								<form @submit="goBuy" class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''">
+									<button class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''" form-type="submit">
+										{{ $t(`立即购买`) }}
+									</button>
+								</form>
+							</view>
 						</view>
-						<view class="bnts acea-row" v-else-if="presale_pay_status === 2">
-							<form @submit="goBuy" class="bnts">
-								<button class="bnts" form-type="submit">{{ $t(`立即购买`) }}</button>
-							</form>
+						<view class="presale" v-else>
+							<view class="acea-row" v-if="presale_pay_status === 1 || presale_pay_status === 3">
+								<form class="bnts bg-color-hui">
+									<button class="bnts bg-color-hui" form-type="submit">{{ presale_pay_status === 1 ? $t(`未开始`) : $t(`已结束`) }}</button>
+								</form>
+							</view>
+							<view class="acea-row" v-else-if="attr.productSelect.quota <= 0 || attr.productSelect.quota < attr.productSelect.cart_num">
+								<form class="bnts bg-color-hui">
+									<button class="bnts bg-color-hui" form-type="submit">{{ $t(`已售罄`) }}</button>
+								</form>
+							</view>
+							<view class="bnts acea-row" v-else-if="presale_pay_status === 2">
+								<form @submit="goBuy" class="bnts">
+									<button class="bnts" form-type="submit">{{ $t(`立即购买`) }}</button>
+								</form>
+							</view>
 						</view>
+					</template>
+					<view class="bnt acea-row" v-else>
+						<form @submit="goBuy" class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''" style="width: 100%;border-radius: 50rpx;">
+							<button class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''" form-type="submit" style="width: 100%;border-radius: 50rpx;">
+								{{ $t(`立即购买`) }}
+							</button>
+						</form>
 					</view>
 				</view>
 
@@ -1466,6 +1475,7 @@ export default {
 				});
 			}
 			let q = {
+				is_pack: that.storeInfo.is_pack,
 				productId: that.id,
 				cartNum: that.attr.productSelect.cart_num,
 				new: news === undefined ? 0 : 1,
@@ -1477,7 +1487,7 @@ export default {
 					that.isOpen = false;
 					that.attr.cartAttr = false;
 					if (news) {
-						let url = '/pages/goods/order_confirm/index?new=1&cartId=' + res.data.cartId;
+						let url = '/pages/goods/order_confirm/index?new=1&cartId=' + res.data.cartId + '&is_pack=' + that.storeInfo.is_pack;
 						if (this.isGiftOrder) url += '&is_gift=' + this.isGiftOrder;
 						uni.navigateTo({
 							url

pages/user/index.vue

@@ -97,14 +97,14 @@
 								<text class="num">{{ userInfo.now_money || 0 }}</text>
 								<view class="txt">{{ $t('余额') }}</view>
 							</view>
-							<view class="num-item" v-else @click="goMenuPage('/pages/users/user_goods_collection/index')">
-								<text class="num">{{ userInfo.collectCount || 0 }}</text>
-								<view class="txt">{{ $t('收藏') }}</view>
+							<view class="num-item" @click="goMenuPage('/pages/users/user_integral/guquan')">
+								<text class="num">{{ userInfo.share || 0 }}</text>
+								<view class="txt">{{ $t('股权') }}</view>
 							</view>
-							<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+							<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
 								<text class="num">{{ userInfo.couponCount || 0 }}</text>
 								<view class="txt">{{ $t('优惠券') }}</view>
-							</view>
+							</view> -->
 							<view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
 								<text class="num">{{ userInfo.integral || 0 }}</text>
 								<view class="txt">{{ $t('积分') }}</view>
@@ -267,7 +267,7 @@
 						</block>
 					</view>
 				</view>
-				<image :src="copyRightPic" alt="" class="support"></image>
+				<!-- <image :src="copyRightPic" alt="" class="support"></image> -->
 				<view class="uni-p-b-98"></view>
 			</scroll-view>
 			<editUserModal :isShow="editModal" @closeEdit="closeEdit" @editSuccess="editSuccess"></editUserModal>

pages/users/login/index.vue

@@ -88,12 +88,12 @@
 				</checkbox-group>
 			</view>
 		</view>
-		<view class="bottom">
+		<!-- <view class="bottom">
 			<view class="ver" v-if="copyRight">{{ copyRight }}</view>
 			<view v-else class="ver">
 				<a href="https://www.crmeb.com">Copyright ©2024 CRMEB. All Rights</a>
 			</view>
-		</view>
+		</view> -->
 		<Verify @success="success" :captchaType="captchaType" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
 	</view>
 </template>