新加新接口

api/tabBar/homeNew.js

@@ -87,4 +87,19 @@ export const stockDescListV1 = (data) => {
 		method: 'GET',
 		params: data
 	})
+}
+// 库存查询
+export const listShareV1 = (data) => {
+	return http.request({
+		url: '/blade-sales-part/shoppingmalldetail/listShareV1',
+		method: 'GET',
+		params: data
+	})
+}
+export function isProcurement(data) {
+	return http.request({
+		url: '/blade-system/paramservice/retrieveParameters',
+		method: 'get',
+		params: data
+	})
 }

common/setting.js

@@ -10,9 +10,9 @@ module.exports = {
 	version: '1.0.0',
 	// 开发环境接口Url
 	// devUrl: 'http://192.168.0.111:1080',
-	// devUrl: 'http://192.168.8.113:1080',
+	devUrl: 'http://192.168.8.113:1080',
 	// devUrl: 'https://td.echepei.com/api', 
-	devUrl: 'https://lt.echepei.com/api',   // 鑫畅途的
+	// devUrl: 'https://lt.echepei.com/api',   // 鑫畅途的
 	// devUrl: 'http://jxy.natapp1.cc/api',
 	// devUrl: 'http://121.37.83.47:10004',
 	// 线上环境接口Url

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "武汉特好卖总仓",
+    "name" : "舜动力汽配",
     "appid" : "__UNI__487FA21",
     "description" : "",
     "versionName" : "1.0.53",
@@ -125,7 +125,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx8cad72583ab475bd",
+        "appid" : "wxf37f32ee0d3a10a7",
         "setting" : {
             "urlCheck" : false,
             "postcss" : true,

pages/views/buyGoods/commodityDetails.vue

@@ -5,11 +5,11 @@
 			<u-swiper :list="form.filesList" indicator indicatorMode="dot" :autoplay="false" height="800rpx"
 				@click="swiperclick" imgMode="aspectFit"></u-swiper>
 		</view>
-		<view class="contentBox" v-if="Number(form.inventory)>0">
+		<view class="contentBox" v-if="Number(form.inventory) > 0">
 			<view style="display: flex;align-items: center;">
 				<view>
-					<text
-						style="font-size: 58rpx;color: red;margin-right: 20rpx;">￥{{checkStatus == '通过'?form.mallPrice || 0:'***'}}</text>
+					<text style="font-size: 58rpx;color: red;margin-right: 20rpx;">￥{{ checkStatus == '通过' ? form.mallPrice
+						|| 0 :'***'}}</text>
 					<!-- <text style="font-size: 48rpx;text-decoration:line-through;">￥{{form.standardPrice}}</text> -->
 				</view>
 				<view style="display: flex;">
@@ -22,14 +22,14 @@
 				</view>
 			</view>
 			<view>
-				<text>{{form.cname}}</text>
+				<text>{{ form.cname }}</text>
 			</view>
 		</view>
-		<view class="contentBox" v-if="Number(form.inventory)==0" style="color:#909399;">
+		<view class="contentBox" v-if="Number(form.inventory) == 0" style="color:#909399;">
 			<view style="display: flex;align-items: center;">
 				<view>
-					<text
-						style="font-size: 58rpx;color:#909399;margin-right: 20rpx;">￥{{checkStatus == '通过'?form.mallPrice || 0:'***'}}</text>
+					<text style="font-size: 58rpx;color:#909399;margin-right: 20rpx;">￥{{ checkStatus ==
+						'通过' ? form.mallPrice || 0 :'***'}}</text>
 					<!-- <text style="font-size: 48rpx;text-decoration:line-through;">￥{{form.standardPrice}}</text> -->
 				</view>
 				<view style="display: flex;">
@@ -42,25 +42,30 @@
 				</view>
 			</view>
 			<view>
-				<text>{{form.cname}}</text>
+				<text>{{ form.cname }}</text>
 			</view>
 		</view>
-		<view class="head" v-if="Number(form.inventory)>0">
+		<view class="head" v-if="Number(form.inventory) > 0">
 			<u-cell-group title-bg-color="rgb(243, 244, 246)" :border="false">
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
-						<u-radio-group v-model="dataForm.type" placement="row" @change="groupChange">
-							<u-radio activeColor="#FD4B09" v-if="dataForm.thisLocality"
-								:label="`今日达(库存:${~~(dataForm.thisLocality.inventory) > 10?'充足':~~(dataForm.thisLocality.inventory)})`"
-								:name="0"></u-radio>
-							<u-radio activeColor="#FD4B09" v-if="dataForm.offsite"
-								:label="`次日达(库存:${~~(dataForm.offsite.inventory) > 10?'充足':~~(dataForm.offsite.inventory)})`"
-								:name="1"></u-radio>
-						</u-radio-group>
+						<view style="display: flex;">
+							<u-radio-group v-model="inventoryDataForm.storeInventory">
+								<u-radio :activeColor="inventoryDataForm.storeInventory>0?'#FD4B09':'#909399'" v-if="inventoryDataForm.storeInventory"
+									:label="`今日达(库存:${~~(inventoryDataForm.storeInventory) > 10 ? '充足' : ~~(inventoryDataForm.storeInventory)})`"
+									:name="inventoryDataForm.storeInventory"></u-radio>
+							</u-radio-group>
+							<u-radio-group v-model="inventoryDataForm.storeInventoryShare">
+								<u-radio :activeColor="inventoryDataForm.storeInventoryShare>0?'#5ac725':'#909399'" v-if="inventoryDataForm.storeInventoryShare"
+									:label="`次日达(库存:${~~(inventoryDataForm.storeInventoryShare) > 10 ? '充足' : ~~(inventoryDataForm.storeInventoryShare)})`"
+									:name="inventoryDataForm.storeInventoryShare"></u-radio>
+							</u-radio-group>
+						</view>
+					
 					</template>
 					<template slot="value">
 						<view>
-							<u-icon :name="inventoryFalse?'arrow-up':'arrow-down'"
+							<u-icon :name="inventoryFalse ? 'arrow-up' : 'arrow-down'"
 								@click="inventoryFalsefun()"></u-icon>
 						</view>
 					</template>
@@ -76,7 +81,7 @@
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
 						<!-- 一种利用符号进行的类型转换,转换成数字类型 -->
-						<text>库存：{{form.inventory?~~(form.inventory) > 10?'充足':~~(form.inventory):''}}</text>
+						<text>库存：{{ form.inventory ? ~~(form.inventory) > 10 ? '充足' : ~~(form.inventory) : '' }}</text>
 					</template>
 					<template slot="value">
 						<u-number-box v-model="form.goodsNum" :min="1" :max="form.inventory"></u-number-box>
@@ -84,29 +89,33 @@
 				</u-cell>
 			</u-cell-group>
 			<u-cell-group title-bg-color="rgb(243, 244, 246)" :border="false" v-if="inventoryFalse">
-				<u-cell v-for="(item,index) in inventoryData" :key="index" titleStyle="color:#fd4b09;font-weight: 600;"
+				<u-cell v-for="(item, index) in inventoryData" :key="index" titleStyle="color:#fd4b09;font-weight: 600;"
 					:title="item.storageName"
-					:value="Number(item.storeInventory) > 10?'充足':Number(item.storeInventory)"></u-cell>
+					:value="Number(item.storeInventory) > 10 ? '充足' : Number(item.storeInventory)"></u-cell>
 			</u-cell-group>
 
 
 		</view>
-		<view class="head" v-if="Number(form.inventory)==0">
+		<view class="head" v-if="Number(form.inventory) == 0">
 			<u-cell-group title-bg-color="rgb(243, 244, 246)" :border="false">
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
-						<u-radio-group v-model="dataForm.type" placement="row" @change="groupChange">
-							<u-radio activeColor="#909399" v-if="dataForm.thisLocality"
-								:label="`今日达(库存:${~~(dataForm.thisLocality.inventory) > 10?'充足':~~(dataForm.thisLocality.inventory)})`"
-								:name="0"></u-radio>
-							<u-radio activeColor="#909399" v-if="dataForm.offsite"
-								:label="`次日达(库存:${~~(dataForm.offsite.inventory) > 10?'充足':~~(dataForm.offsite.inventory)})`"
-								:name="1"></u-radio>
-						</u-radio-group>
+						<view style="display: flex;">
+							<u-radio-group v-model="inventoryDataForm.storeInventory">
+								<u-radio activeColor="#909399" v-if="inventoryDataForm.storeInventory"
+									:label="`今日达(库存:${~~(inventoryDataForm.storeInventory) > 10 ? '充足' : ~~(inventoryDataForm.storeInventory)})`"
+									:name="inventoryDataForm.storeInventory"></u-radio>
+							</u-radio-group>
+							<u-radio-group v-model="inventoryDataForm.storeInventoryShare">
+								<u-radio activeColor="#909399" v-if="inventoryDataForm.storeInventoryShare"
+									:label="`次日达(库存:${~~(inventoryDataForm.storeInventoryShare) > 10 ? '充足' : ~~(inventoryDataForm.storeInventoryShare)})`"
+									:name="inventoryDataForm.storeInventoryShare"></u-radio>
+							</u-radio-group>
+						</view>
 					</template>
 					<template slot="value">
 						<view>
-							<u-icon :name="inventoryFalse?'arrow-up':'arrow-down'"
+							<u-icon :name="inventoryFalse ? 'arrow-up' : 'arrow-down'"
 								@click="inventoryFalsefun()"></u-icon>
 						</view>
 					</template>
@@ -122,8 +131,8 @@
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
 						<!-- 一种利用符号进行的类型转换,转换成数字类型 -->
-						<text
-							style="color: #909399;">库存：{{form.inventory?~~(form.inventory) > 10?'充足':~~(form.inventory):''}}</text>
+						<text style="color: #909399;">库存：{{ form.inventory ? ~~(form.inventory) >
+							10 ? '充足' : ~~(form.inventory) :''}}</text>
 					</template>
 					<template slot="value">
 						<u-number-box v-model="form.goodsNum" :min="1" :max="form.inventory"></u-number-box>
@@ -131,9 +140,9 @@
 				</u-cell>
 			</u-cell-group>
 			<u-cell-group title-bg-color="#909399" :border="false" v-if="inventoryFalse">
-				<u-cell v-for="(item,index) in inventoryData" :key="index" titleStyle="color:#909399;font-weight: 600;"
+				<u-cell v-for="(item, index) in inventoryData" :key="index" titleStyle="color:#909399;font-weight: 600;"
 					:title="item.storageName"
-					:value="Number(item.storeInventory) > 10?'充足':Number(item.storeInventory)"></u-cell>
+					:value="Number(item.storeInventory) > 10 ? '充足' : Number(item.storeInventory)"></u-cell>
 			</u-cell-group>
 
 
@@ -146,7 +155,7 @@
 						<text>规格型号：</text>
 					</template>
 					<template slot="value">
-						<text>{{form.specificationAndModel||''}}</text>
+						<text>{{ form.specificationAndModel || '' }}</text>
 					</template>
 				</u-cell>
 				<u-cell :isLink="false" :border="false" center>
@@ -154,28 +163,28 @@
 						<text>花纹：</text>
 					</template>
 					<template slot="value">
-						<text>{{form.brandItem||''}}</text>
+						<text>{{ form.brandItem || '' }}</text>
 					</template>
 				</u-cell>
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
-						<text>产地：{{form.placeProduction||''}}</text>
+						<text>产地：{{ form.placeProduction || '' }}</text>
 					</template>
 					<template slot="value">
-						<text>防爆：{{form.explosionProof==1?"是":"否"}}</text>
+						<text>防爆：{{ form.explosionProof == 1 ? "是" : "否" }}</text>
 					</template>
 				</u-cell>
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
-						<text>原厂：{{form.originalFactory==1?'是':'否'}}</text>
+						<text>原厂：{{ form.originalFactory == 1 ? '是' : '否' }}</text>
 					</template>
 					<template slot="value">
-						<text>自修补：{{form.selfRecovery==1?'是':'否'}}</text>
+						<text>自修补：{{ form.selfRecovery == 1 ? '是' : '否' }}</text>
 					</template>
 				</u-cell>
 				<u-cell :isLink="false" :border="false" center>
 					<template slot="title">
-						<text>商品描述：{{form.detailsText?form.detailsText:'-'}}</text>
+						<text>商品描述：{{ form.detailsText ? form.detailsText : '-' }}</text>
 					</template>
 				</u-cell>
 			</u-cell-group>
@@ -223,11 +232,14 @@
 		addToCart,
 		appModifyPrice,
 		stockDescList,
-		stockDescListV1
+		stockDescListV1,
+		listShareV1,
+		isProcurement
 	} from '@/api/tabBar/homeNew.js'
 	export default {
 		data() {
 			return {
+				inventoryDataForm: {},
 				checkboxValue: [],
 				form: {
 					shareList: []
@@ -288,6 +300,12 @@
 			},
 			// 库存查询
 			stockDescListfun() {
+				listShareV1({
+					code: this.form.goodsCode,
+					whether: 0
+				}).then(res => {
+					this.inventoryDataForm = res.data
+				})
 				stockDescListV1({
 					cname: this.form.cname,
 					whether: 0
@@ -353,14 +371,6 @@
 					this.showWarehouse = false
 				})
 			},
-			groupChange(val) {
-				console.log(val)
-				if (val == 0) {
-					this.form = this.dataForm.thisLocality
-				} else {
-					this.form = this.dataForm.offsite
-				}
-			},
 			shoppingCart() {
 				uni.$u.route({
 					url: 'pages/tabBar/shoppingCart',