shish преди 4 години
родител
ревизия
9ed166ed83

+ 2 - 1
ghsPad/src/manifest.json

@@ -48,7 +48,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 50 - 35
hdApp/src/admin/goodsManage/detail.vue

@@ -24,12 +24,13 @@
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
-          <input v-model="form.stock" placeholder-class="phcolor" class="tui-input" disabled="true" name="stock" placeholder="留空表示库存充足" maxlength="50" type="number" />
+          <input v-model="form.stock" placeholder-class="phcolor" style="color:#CCCCCC;" class="tui-input" disabled="true" name="stock" placeholder="留空表示库存充足" maxlength="50" type="number" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">历史销量</view>
           <input v-model="form.sold" placeholder-class="phcolor" class="tui-input" name="sold" placeholder="选填,显示的销量=历史销量+真实销量" maxlength="50" type="number" />
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">节日涨价</view>
           <label for="autoPrice" class="tui-input" @click="autoRiseChange(form.autoRise)">
@@ -37,13 +38,6 @@
             <span>需要</span>
           </label>
         </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">配送方式</view>
-          <label for="sendType" class="tui-input" @click="needSendChange(form.needSend)">
-            <checkbox id="sendType" class="ljd-checkbox" :checked="form.needSend == 1" @change="giftChange" style="transform: scale(0.7,0.7);" ></checkbox>
-            <span>仅自取</span>
-          </label>
-        </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">运费</view>
@@ -59,6 +53,20 @@
           </radio-group>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">库存不足时</view>
+          <radio-group class="tui-input" @change="stockSetChange">
+            <label class="list" for="stockCouldOrder">
+              <radio id="stockCouldOrder" value="1" :checked="form.stockSet == 1" style="transform: scale(0.8,0.8);" />
+              <span class="checkbox-text">可以下单</span>
+            </label>
+            <label class="list" for="stockNotOrder">
+              <radio id="stockNotOrder" value="0" :checked="form.stockSet == 0" style="transform: scale(0.8,0.8);" />
+              <span class="checkbox-text">不能下单</span>
+            </label>
+          </radio-group>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">状态</view>
           <radio-group class="tui-input" @change="statusChange">
@@ -93,33 +101,35 @@
         </tui-list-cell>
       </view>
 
-      <view class="module-com content-box proInfo" v-if="form.flower == 1">
-        <view class="commodity-view">
-          <view class="infoAEdit">
-            <text>使用花材</text>
-          </view>
-          <view class="commodity-list">
-            <view v-for="(s, idx) in goodsInfo.goodsItem" :key="idx" class="commodity-item" >
-              <image class="item-icon" :src="s.smallCover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
-              <view class="item-info">
-                <view class="info-line">
-                  <text class="item-name">{{ s.name }}</text>
-                  <text class="item-price">
-                    <text class="unit"></text>
-                    <text class="price">
-                      <text>{{s.num}}{{s.unitName}}</text>
+      <template v-if="form.flower == 1">
+        <view class="module-com content-box proInfo">
+          <view class="commodity-view">
+            <view class="infoAEdit">
+              <text>使用花材</text>
+            </view>
+            <view class="commodity-list">
+              <view v-for="(s, idx) in goodsInfo.goodsItem" :key="idx" class="commodity-item" >
+                <image class="item-icon" :src="s.smallCover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
+                <view class="item-info">
+                  <view class="info-line">
+                    <text class="item-name">{{ s.name }}</text>
+                    <text class="item-price">
+                      <text class="unit"></text>
+                      <text class="price">
+                        <text>{{s.num}}{{s.unitName}}</text>
+                      </text>
                     </text>
-                  </text>
+                  </view>
                 </view>
               </view>
             </view>
-          </view>
-          <view class="summary-bar">
-            <view class="operate-view"></view>
-            <view class="describe-view">共<text v-if="Number(goodsInfo.bigNum)>0">{{goodsInfo.bigNum}}扎</text><text v-if="Number(goodsInfo.smallNum)>0">{{goodsInfo.smallNum}}支</text></view>
+            <view class="summary-bar">
+              <view class="operate-view"></view>
+              <view class="describe-view">共<text v-if="Number(goodsInfo.bigNum)>0">{{goodsInfo.bigNum}}扎</text><text v-if="Number(goodsInfo.smallNum)>0">{{goodsInfo.smallNum}}支</text></view>
+            </view>
           </view>
         </view>
-      </view>
+      </template>
 
       <view class="module-com input-line-wrap goods-wrap">
         <view class="module-tit">
@@ -176,13 +186,13 @@ export default {
         price: "",
         categoryIdList: [],
         autoRise: "1",
-        needSend: "0",
         freightType: "0",
         shopImg: [],
         briefContent: "",
         status:1,
         flower:1,
-        flowerNum:0
+        flowerNum:0,
+        stockSet:1
       }
     };
   },
@@ -219,7 +229,7 @@ export default {
           return;
         }
         this.goodsInfo = res.data
-        Object.keys(this.form).forEach((i, index) => {
+        Object.keys(this.form).forEach((i) => {
           this.form[i] = res.data[i];
         });
         this.form.sold = res.data.sold
@@ -278,9 +288,6 @@ export default {
     autoRiseChange(e) {
       this.form.autoRise = e == "0" ? "1" : "0";
     },
-    needSendChange(e) {
-      this.form.needSend = e == "0" ? "1" : "0";
-    },
     freightChange(e) {
       this.form.freightType = e.detail.value;
     },
@@ -289,6 +296,14 @@ export default {
         this.$msg('不可修改')
         return false
       }
+    },
+    stockSetChange(e){
+      this.form.stockSet = e.detail.value
+      console.log(this.form.stockSet)
+    },
+    statusChange(e){
+      this.form.status = e.detail.value
+      console.log(this.form.status)
     }
   }
 };

+ 2 - 1
hdApp/src/manifest.json

@@ -88,7 +88,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
hdPad/src/manifest.json

@@ -78,7 +78,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 5 - 4
hdPad/src/mixins/product.js

@@ -41,8 +41,9 @@ export default {
 
 				}else{
 					for (const item of this.selectList) {
-						let currentPrice = this.$util.mul(item.unitPrice,item.currentNum)
-						price = this.$util.add(currentPrice,price)
+						let currentPrice = Number(item.unitPrice)*Number(item.currentNum)
+						price = Number(currentPrice)+Number(price)
+						price = parseFloat(price.toFixed(2))
 					}
 				}
 			}
@@ -59,9 +60,9 @@ export default {
 				}else{
 					for (const item of this.selectList) {
 						if(item.unitType == 0){
-							bigNum = this.$util.add(bigNum,item.currentNum)
+							bigNum = Number(bigNum)+Number(item.currentNum)
 						}else{
-							smallNum = this.$util.add(smallNum,item.currentNum)
+							smallNum = Number(smallNum)+Number(item.currentNum)
 						}
 					}
 				}

+ 0 - 1
hdPad/src/pages/home/components/console.vue

@@ -136,7 +136,6 @@ export default {
 			this.calc = this.calc == 'add' ? 'sub' : 'add'
 		},
 		takeItem(code){
-			code = 1001
 			let current = this.allProduct.find(function(val){
 				return val.itemId == code
 			})

+ 7 - 1
jdApp/src/manifest.json

@@ -67,7 +67,13 @@
             },
             /* ios打包配置 */
             "ios" : {
-                "urlschemewhitelist" : [ "baidumap", "iosamap" ]
+                "urlschemewhitelist" : [ "baidumap", "iosamap" ],
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
+                    "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
mallApp/src/manifest.json

@@ -72,7 +72,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
开发/ghsApp/src/manifest.json

@@ -58,7 +58,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
开发/ghsPad/src/manifest.json

@@ -48,7 +48,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
开发/hdApp/src/manifest.json

@@ -88,7 +88,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
开发/hdPad/src/manifest.json

@@ -78,7 +78,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
开发/mallApp/src/manifest.json

@@ -73,7 +73,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
线上/ghsPad/src/manifest.json

@@ -48,7 +48,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
线上/hdApp/src/manifest.json

@@ -88,7 +88,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
线上/hdPad/src/manifest.json

@@ -78,7 +78,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 8 - 1
线上/km-app/src/manifest.json

@@ -67,7 +67,14 @@
             },
             /* ios打包配置 */
             "ios" : {
-                "urlschemewhitelist" : [ "baidumap", "iosamap" ]
+                "UIBackgroundModes" : [ "audio" ],
+                "urlschemewhitelist" : [ "baidumap", "iosamap" ],
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
+                    "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {

+ 2 - 1
线上/mallApp/src/manifest.json

@@ -72,7 +72,8 @@
                     "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册,以便支持您修改花材的图片",
                     "NSCameraUsageDescription" : "该应用需要获取您的摄像头权限,以便支持您直接拍照上传并修改花材的图片"
-                }
+                },
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {