保存

packageA/fittings/modules/product/index.js

@@ -110,7 +110,7 @@ Component({
                     } else {
                         if (v.cover) v.cover = _Http.getImageUrl(v.cover)
                     }
-                    
+
                     v.deliveryIdenx = this.data.deliverys.findIndex(s => s.value == v.delivery) || 0;
                     v.showPrice = CNY(v.price)
                     v.showAmount = CNY(v.amount)
@@ -235,8 +235,10 @@ Component({
                         "id": 20230208140203,
                         "content": {
                             "isadmin": 1,
+                            ishasitem:true,
                             "where": {
                                 "sys_enterpriseid_service": this.data.base.sys_enterpriseid,
+                                ishasitem:true,
                             },
                             "pageSize": 20,
                             "pageNumber": 1,

packageA/fittings/modules/product/list/index.wxml

@@ -56,7 +56,7 @@
             <view style="width: 78%;">
                 <view class="label">发货方式:</view>
                 <picker class="picker" mode='selector' disabled='{{disabled}}' range='{{deliverys}}' value="{{item.deliveryIdenx}}" range-key='value' data-data="{{item}}" data-index="{{index}}" bindchange='changeDelivery'>
-                    {{item.delivery}}
+                    {{item.delivery||'未选择'}}
                 </picker>
             </view>
             <navigator url="#" class="viewDetail" data-item="{{item}}" bind:tap="viewDetail">

packageA/market/detail.js

@@ -284,7 +284,7 @@ Page({
 	async placeAnOrder(index) {
 		let detail = this.data.detail,
 			content = {
-				"type": "标准订单",
+				"type": detail.ismodule == 1 ? '配件订单' : '标准订单',
 				tradefield: '默认',
 				sa_accountclassid: 0
 			},

packageA/market/detail.scss

@@ -274,4 +274,26 @@ swiper {
 
 .bg-orange {
   background-color: #F37B1D !important;
+}
+
+.footer {
+  display: flex;
+  justify-content: center;
+  position: fixed;
+  bottom: 0;
+  width: 100vw;
+  min-height: 130rpx;
+  background-color: #fff;
+  box-shadow: 0px -2px 6px 1px rgba(0, 0, 0, 0.16);
+
+  .but {
+    width: 690rpx;
+    height: 90rpx;
+    background: #FA8C16;
+    border-radius: 16rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #FFFFFF;
+    margin-top: 10rpx;
+  }
 }

packageA/market/detail.wxml

@@ -14,13 +14,13 @@
 <view class="intr">
     <view class="title">
         {{detail.itemname}}
-        <van-tag  wx:if='{{detail.delistingstatus}}' size='medium' type="warning">{{detail.delistingstatus}}</van-tag>
+        <van-tag wx:if='{{detail.delistingstatus}}' size='medium' type="warning">{{detail.delistingstatus}}</van-tag>
     </view>
-    <view class="tags">
+    <!--    <view class="tags">
         <text wx:if="{{detail.iscustomsize==1}}" style="background-color: #EE0A24;color: #fff;">定制</text>
         <text wx:for="{{detail.brand}}" wx:key="sa_brandid">{{item.brandname}}</text>
         <text wx:for="{{detail.tradefield}}" wx:key="index">{{item.tradefield}}</text>
-    </view>
+    </view> -->
     <view class="offer">
         <view>
             <text class="price">{{handleHide.verify(detail.gradeprice,"详情-当前商品价格",privacyFieldC)}}</text>
@@ -73,7 +73,8 @@
     </view>
 
     <view class="label">
-        数量 <text style="font-size: 24rpx;font-weight: 400;">(起订量:{{detail.orderminqty}}，增减量:{{detail.orderaddqty}}<!-- ，包装量:{{detail.packageqty}} -->)</text>
+        数量 <text style="font-size: 24rpx;font-weight: 400;">(起订量:{{detail.orderminqty}}，增减量:{{detail.orderaddqty}})
+        </text>
     </view>
     <view class="product-box" style="margin-top: 20rpx;">
         <van-stepper value="{{ detail.qty }}" min="{{detail.orderminqty}}" step="{{detail.orderaddqty||1}}" input-class='input-class' data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
@@ -106,12 +107,6 @@
             <view class="row">
                 规格：{{detail.standards || ' --'}}
             </view>
-          <!--   <view class="row">
-                别名：{{detail.byname || ' --'}}
-            </view>
-            <view class="row">
-                特殊说明：<text wx:if="{{detail.specalnote}}" style="color: red;">{{detail.specalnote}}</text><text wx:else> --</text>
-            </view> -->
         </view>
     </van-tab>
     <van-tab title="产品资料">
@@ -121,29 +116,19 @@
         </view>
     </van-tab>
 </van-tabs>
+
 <view style="height: 200rpx;" />
-<view class="cu-bar bg-white tabbar border shop footer" style="display: flex;">
+<view wx:if="{{!detail.ismodule}}" class="cu-bar bg-white tabbar border shop footer" style="display: flex;">
     <navigator url="#" class="action " style="height: 100%;display: flex; flex-direction: column; align-items: center;" bindtap="toCollect">
         <view class="cuIcon-cart" style="color: #F37B1D;">
             <view class="cu-tag badge">{{badge}}</view>
         </view>
         购物车
     </navigator>
-    <navigator wx:if="{{isShowFavorites}}" url="/packageA/favorites/index" class="action" style="height: 100%;display: flex; flex-direction: column; align-items: center;">
-        <view class="{{detail.iscollection?'cuIcon-favorfill':'cuIcon-favor'}}" style="color:{{detail.iscollection?'#FADB14':''}}">
-            <view class="cu-tag badge">{{favoriteCount}}</view>
-        </view>
-        收藏夹
-    </navigator>
-
-    <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' disabled='{{itemCount!=selectCount}}' range-key='tradefield' bindchange='storage'>
-        <van-button custom-class="bg-orange submit {{isShowFavorites?'w240':'w610'}}" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">加入购物车</van-button>
-    </picker>
-    <van-button wx:else custom-class="bg-orange submit {{isShowFavorites?'w240':'w610'}}" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">加入购物车</van-button>
-
-    <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' disabled='{{itemCount!=selectCount}}' range-key='tradefield' bindchange='storage'>
-        <van-button custom-class="bg-blue submit {{isShowFavorites?'w240':'w610'}}" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">立即下单</van-button>
-    </picker>
-    <van-button wx:else custom-class="bg-blue submit {{isShowFavorites?'w240':'w610'}}" id='placeAnOrder' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">立即下单</van-button>
+    <van-button custom-class="bg-orange submit {{isShowFavorites?'w240':'w610'}}" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">加入购物车</van-button>
+    <van-button custom-class="bg-blue submit {{isShowFavorites?'w240':'w610'}}" id='placeAnOrder' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">立即下单</van-button>
+</view>
+<view class="footer" wx:else>
+    <van-button custom-class='but' id='placeAnOrder' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">立即下单</van-button>
 </view>
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />

packageA/orderForm/index.wxml

@@ -4,9 +4,7 @@
         <van-tab title="全部" />
         <van-tab title="新建" />
         <van-tab title="提交" />
-        <van-tab title="确认" />
         <van-tab title="审核" />
-        <van-tab title="手工关闭" />
         <van-tab title="关闭" />
     </van-tabs>
     <!-- <view class="tips">

pages/index/market/modules/list/index.wxml

@@ -26,7 +26,7 @@
 				</view>
 				<view class="punit" wx:if="{{isdisplaysaleqty}}">已售{{((item.item[0].soldbase-0)+(item.item[0].saleqty-0))||0}}{{item.unitname}}</view>
 			</view>
-			<view wx:if="{{!item.isscheme}}" class="shopping" data-item="{{item}}" data-index="{{index}}" catchtap="buyMore">
+			<view wx:if="{{!item.item[0].ismodule}}" class="shopping" data-item="{{item}}" data-index="{{index}}" catchtap="buyMore">
 				<view hover-class="navigator-hover" url="#" data-name="购物车" class="iconfont icon-gouwuche" />
 			</view>
 		</view>

pages/login/phone.wxml

@@ -15,13 +15,13 @@
 <Agreement isAgree='{{isAgree}}' bindcallBack='agreementChange' />
 
 <!-- 快捷登录 -->
-<block>
+<!-- <block>
     <view style="height: 100rpx;" />
     <van-divider contentPosition="center">其他登录方式</van-divider>
     <view class="funs-box">
         <text class="iconfont icon-a-wodebangdingweixin" style="font-size: 100rpx; color:#07C160;"
             bindtap="wechatLogin" />
     </view>
-</block>
+</block> -->
 
 <van-toast id="van-toast" />

project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "%E7%BE%8E%E5%A4%A7E%E8%AE%A2%E5%8D%95",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false,
+    "urlCheck": true,
     "autoAudits": false,
     "coverView": true,
     "lazyloadPlaceholderEnable": false,