【模板目录】更新模板

template/admin/src/components/diyComponents/c_goods.vue

@@ -6,7 +6,7 @@
           class="item"
           v-for="(goods, index) in defaults.goodsList.list"
           :key="index"
-          v-if="defaults.goodsList.list.length"
+          v-show="defaults.goodsList.list.length"
         >
           <img :src="type == 1 ? goods.pic : goods.image" alt="" />
           <span class="iconfont icondel_1" v-db-click @click.stop="bindDelete(index)"></span>

template/admin/src/components/storeLabelList/index.vue

@@ -59,10 +59,8 @@ export default {
       }
       return false;
     },
-    // 用户标签
     storeLabel(data) {
       this.dataLabel = data || [];
-      console.log(this.dataLabel, 'datadatadata');
       productLabelUseListApi()
         .then((res) => {
           res.data.map((el) => {

template/admin/src/pages/order/refund/index.vue

@@ -39,7 +39,7 @@
               class="mr20"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="订单号：" label-for="title">
+          <el-form-item label="订单搜索：" label-for="title">
             <el-input clearable v-model="pagination.order_id" placeholder="请输入订单号" class="form_content_width" />
           </el-form-item>
           <el-form-item>

template/admin/src/pages/product/productAdd/components/MarketingSetting.vue

@@ -45,7 +45,7 @@
     <el-col :span="24">
       <div class="line"></div>
     </el-col>
-    <el-col :span="24">
+    <el-col v-if="formValidate.virtual_type == 0" :span="24">
       <el-form-item label="起购数量：">
         <el-input-number
           :controls="false"
@@ -97,7 +97,7 @@
         </div>
       </el-form-item>
     </el-col>
-    <el-col :span="24">
+    <el-col  v-if="formValidate.is_limit" :span="24">
       <div class="line"></div>
     </el-col>
     <el-col :span="24" v-if="formValidate.virtual_type == 0 || formValidate.virtual_type == 3">

template/admin/src/pages/product/productAdd/components/OtherSetting.vue

@@ -107,7 +107,7 @@
           }}</el-checkbox>
         </el-checkbox-group>
         <el-button v-else type="primary" v-db-click @click="addProtection">添加保障</el-button>
-        <div class="tips-info">用户下单时需填写的保障信息，可多选</div>
+        <div class="tips-info">商品详情中显示的服务保障信息，可多选</div>
       </el-form-item>
     </el-col>
     <el-col :span="24">

template/admin/src/pages/product/productAdd/components/PriceCommission.vue

@@ -116,7 +116,7 @@
                   :max="9999999999"
                   class="priceBox input-number-unit-class"
                   class-unit="元"
-                  @change="changeVipPrice(scope.$index, 'oneFormValidate')"
+                  @input="changeVipPrice(0, 'oneFormValidate')"
                 ></el-input-number>
               </template>
               <template v-else-if="item.slot === 'vip_proportion'">
@@ -127,7 +127,7 @@
                   :max="9999999999"
                   class="priceBox input-number-unit-class"
                   class-unit="%"
-                  @change="changeDiscount(scope.$index, 'oneFormValidate')"
+                  @input="changeDiscount(0, 'oneFormValidate')"
                 ></el-input-number>
               </template>
             </template>
@@ -143,7 +143,8 @@
             placeholder="请输入一级返佣"
             class="columnsBox input_width input-number-unit-class"
             class-unit="元"
-            v-model="manyBrokerage"
+            :value="manyBrokerage"
+            @input="(val) => $emit('update:manyBrokerage', val)"
           >
           </el-input-number>
           <span class="brokerage">二级返佣：</span
@@ -152,7 +153,8 @@
             placeholder="请输入二级返佣"
             class="columnsBox input_width input-number-unit-class"
             class-unit="元"
-            v-model="manyBrokerageTwo"
+            :value="manyBrokerageTwo"
+            @input="(val) => $emit('update:manyBrokerageTwo', val)"
           ></el-input-number>
         </span>
         <span class="brokerage" v-if="formValidate.is_sub.indexOf(0) > -1">
@@ -163,8 +165,9 @@
             :max="9999999999"
             class="columnsBox input_width input-number-unit-class"
             class-unit="元"
-            v-model="manyVipPrice"
-            @focus="manyVipDiscount = undefined"
+            :value="manyVipPrice"
+            @input="(val) => $emit('update:manyVipPrice', val)"
+            @focus="$emit('update:manyVipDiscount', undefined)"
           ></el-input-number>
         </span>
         <span class="brokerage" v-if="formValidate.is_sub.indexOf(0) > -1">
@@ -175,8 +178,9 @@
             :max="9999999999"
             class="columnsBox input_width input-number-unit-class"
             class-unit="%"
-            v-model="manyVipDiscount"
-            @focus="manyVipPrice = undefined"
+            :value="manyVipDiscount"
+            @input="(val) => $emit('update:manyVipDiscount', val)"
+            @focus="$emit('update:manyVipPrice', undefined)"
           ></el-input-number>
         </span>
         <el-button type="primary" v-db-click @click="brokerageSetUp">批量设置</el-button>
@@ -258,43 +262,71 @@
               <template v-else-if="item.slot === 'brokerage'">
                 <el-input-number
                   :controls="false"
-                  v-model="manyFormValidate[scope.$index + 1].brokerage"
+                  :value="manyFormValidate[scope.$index + 1].brokerage"
                   :min="0"
                   :max="9999999999"
                   class="priceBox input-number-unit-class"
                   class-unit="元"
+                  @input="
+                    (val) => {
+                      const newData = [...manyFormValidate];
+                      newData[scope.$index + 1].brokerage = val;
+                      $emit('update:manyFormValidate', newData);
+                    }
+                  "
                 ></el-input-number>
               </template>
               <template v-else-if="item.slot === 'brokerage_two'">
                 <el-input-number
                   :controls="false"
-                  v-model="manyFormValidate[scope.$index + 1].brokerage_two"
+                  :value="manyFormValidate[scope.$index + 1].brokerage_two"
                   :min="0"
                   :max="9999999999"
                   class="priceBox input-number-unit-class"
                   class-unit="元"
+                  @input="
+                    (val) => {
+                      const newData = [...manyFormValidate];
+                      newData[scope.$index + 1].brokerage_two = val;
+                      $emit('update:manyFormValidate', newData);
+                    }
+                  "
                 ></el-input-number>
               </template>
               <template v-else-if="item.slot === 'vip_price'">
                 <el-input-number
                   :controls="false"
-                  v-model="manyFormValidate[scope.$index + 1].vip_price"
+                  :value="manyFormValidate[scope.$index + 1].vip_price"
                   :min="0"
                   :max="9999999999"
                   class="priceBox input-number-unit-class"
                   class-unit="元"
-                  @change="changeVipPrice(scope.$index + 1)"
+                  @input="
+                    (val) => {
+                      const newData = [...manyFormValidate];
+                      newData[scope.$index + 1].vip_price = val;
+                      $emit('update:manyFormValidate', newData);
+                      changeVipPrice(scope.$index + 1);
+                    }
+                  "
                 ></el-input-number>
               </template>
               <template v-else-if="item.slot === 'vip_proportion'">
                 <el-input-number
                   :controls="false"
-                  v-model="manyFormValidate[scope.$index + 1].vip_proportion"
+                  :value="manyFormValidate[scope.$index + 1].vip_proportion"
                   :min="0"
                   :max="9999999999"
                   class="priceBox input-number-unit-class"
                   class-unit="%"
-                  @change="changeDiscount(scope.$index + 1)"
+                  @input="
+                    (val) => {
+                      const newData = [...manyFormValidate];
+                      newData[scope.$index + 1].vip_proportion = val;
+                      $emit('update:manyFormValidate', newData);
+                      changeDiscount(scope.$index + 1);
+                    }
+                  "
                 ></el-input-number>
               </template>
             </template>
@@ -356,8 +388,8 @@ export default {
     changeDiscount(index, type) {
       this.$emit('changeDiscount', index, type);
     },
-    brokerageSetUp(val) {
-      this.$emit('brokerageSetUp', val);
+    brokerageSetUp() {
+      this.$emit('brokerageSetUp');
     },
   },
 };

template/admin/src/pages/product/productAdd/components/SpecStock.vue

@@ -605,8 +605,8 @@ export default {
     modalPicTap(type, tableName, index) {
       this.$emit('modalPicTap', type, tableName, index);
     },
-    handleRemove2(index) {
-      this.$emit('handleRemove2', index);
+    handleRemove2(index, type, tableName) {
+      this.$emit('handleRemove2', index, type, tableName);
     },
     batchAdd() {
       this.$emit('batchAdd');
@@ -620,6 +620,12 @@ export default {
     handleFocus(e) {
       this.$emit('handleFocus', e);
     },
+    attrDetailChangeValue(val, index) {
+      this.$emit('attrDetailChangeValue', val, index);
+    },
+    handleBlur(e) {
+      this.$emit('handleBlur', e);
+    },
     attrChangeValue(val, index) {
       this.$emit('attrChangeValue', val, index);
     },

template/admin/src/pages/product/productAdd/index.vue

@@ -107,10 +107,10 @@
           :manyFormValidate="manyFormValidate"
           :columnsInstall="columnsInstall"
           :columnsInstal2="columnsInstal2"
-          :manyBrokerage="manyBrokerage"
-          :manyBrokerageTwo="manyBrokerageTwo"
-          :manyVipPrice="manyVipPrice"
-          :manyVipDiscount="manyVipDiscount"
+          :manyBrokerage.sync="manyBrokerage"
+          :manyBrokerageTwo.sync="manyBrokerageTwo"
+          :manyVipPrice.sync="manyVipPrice"
+          :manyVipDiscount.sync="manyVipDiscount"
           @checkAllGroupChange="checkAllGroupChange"
           @changeVipPrice="changeVipPrice"
           @changeDiscount="changeDiscount"
@@ -1430,8 +1430,18 @@ export default {
       }
 
       // 批量设置商品规格属性
-      const batchFields = ['pic', 'price', 'cost', 'ot_price', 'stock', 'weight', 'volume'];
-      const defaultFields = ['bar_code', 'bar_code_number'];
+      const batchFields = [
+        'pic',
+        'price',
+        'cost',
+        'ot_price',
+        'stock',
+        'weight',
+        'volume',
+        'bar_code',
+        'bar_code_number',
+      ];
+      // const defaultFields = ['bar_code', 'bar_code_number'];
 
       for (let val of this.manyFormValidate) {
         const batch = this.oneFormBatch[0];
@@ -1439,7 +1449,7 @@ export default {
         if (!arr.length || this.isSubset(val.attr_arr, arr)) {
           // 设置有值的批量字段
           batchFields.forEach((field) => {
-            if (batch[field] !== undefined) {
+            if (batch[field] && batch[field] !== undefined) {
               if (field === 'pic' && batch[field]) {
                 this.$set(val, field, batch[field]);
               } else if (field != 'pic') {
@@ -1449,9 +1459,9 @@ export default {
           });
 
           // 设置默认字段
-          defaultFields.forEach((field) => {
-            this.$set(val, field, batch[field]);
-          });
+          // defaultFields.forEach((field) => {
+          //   this.$set(val, field, batch[field]);
+          // });
         }
       }
     },

template/uni-app/api/points_mall.js

@@ -14,5 +14,7 @@ import request from "@/utils/request.js";
  * 积分商城
  */
 export function getStoreIntegral(data) {
-	return request.get("store_integral/index", data);
+	return request.get("store_integral/index", data, {
+		noAuth: true
+	});
 }

template/uni-app/pages/index/components/userInfor.vue

@@ -223,8 +223,6 @@
 			}
 		},
 		methods: {
-			hello(res) {
-			},
 			getCode() {
 				getRandCode().then(res => {
 					let code = res.data.code;

template/uni-app/pages/index/index.vue

@@ -102,13 +102,16 @@
 					<view v-if="configData && configData.record_No" class="site-config" @click="goICP(configData.icp_url)">{{ configData.record_No }}</view>
 					<view class="site-config" v-if="configData && configData.network_security" @click="goICP(configData.network_security_url)">
 						<image class="ban" src="/static/images/beian.png" alt="" srcset="" />
-						{{configData.network_security}}
+						{{ configData.network_security }}
 					</view>
 					<!-- #endif -->
 					<view class="pb-safe" :style="[pdHeights]" v-if="isFooter"></view>
 					<pageFooter :configData="footerConfigData" @newDataStatus="newDataStatus"></pageFooter>
 				</view>
 			</view>
+			<!-- #ifdef APP -->
+			<app-update ref="appUpdate" :force="true" :tabbar="false"></app-update>
+			<!-- #endif -->
 		</view>
 		<view v-else>
 			<view class="error-network">
@@ -180,6 +183,8 @@ import { HTTP_REQUEST_URL } from '@/config/app';
 import pageFooter from '@/components/pageFooter/index.vue';
 import Loading from '@/components/Loading/index.vue';
 import Cache from '@/utils/cache';
+import appUpdate from '@/components/update/app-update.vue';
+
 export default {
 	computed: {
 		// #ifdef MP
@@ -243,7 +248,10 @@ export default {
 		hotspot,
 		follow,
 		waterfallsFlow,
-		emptyPage
+		emptyPage,
+		// #ifdef APP
+		appUpdate
+		// #endif
 	},
 	data() {
 		return {
@@ -285,7 +293,7 @@ export default {
 			homeCombData: {},
 			headerSerchCombData: {},
 			cateNavData: {},
-			footerConfigData:{},
+			footerConfigData: {},
 			bgColor: '',
 			bgPic: '',
 			bgTabVal: '',
@@ -724,7 +732,7 @@ export default {
 			let lastArr = this.objToArr(data.value);
 			lastArr.forEach((item, index, arr) => {
 				if (item.name == 'pageFoot') {
-					this.footerConfigData = item
+					this.footerConfigData = item;
 				}
 				if (item.name === 'homeComb' && !item.isHide) {
 					this.showHomeComb = true;
@@ -1015,7 +1023,7 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	.ban{
+	.ban {
 		width: 22rpx;
 		height: 24rpx;
 		margin-right: 10rpx;