更新前端文件

crmeb/public/statics/mp_view/components/Authorize.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/addressWindow/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/components/goodList/index.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/components/shareRedPackets/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/activity/goods_bargain_details/index.json

@@ -1,6 +1,5 @@
 {
-  "navigationStyle": "custom",
-  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "砍价活动",
   "usingComponents": {
     "jyf-parser": "/components/mp-html/mp-html",
     "count-down": "/components/countDown/index",

crmeb/public/statics/mp_view/pages/index/diy/components/articleList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/diy/components/bargain.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/diy/components/combination.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/customerService.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/diy/components/goodList.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/diy/components/menus.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/news.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/pictureCube.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/diy/components/swiperBg.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

crmeb/public/statics/mp_view/pages/index/diy/components/swipers.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

crmeb/public/statics/mp_view/pages/index/diy/components/titles.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

template/admin/src/pages/order/orderList/components/tableList.vue

@@ -55,7 +55,12 @@
           部分退款中
         </div>
         <div
-          v-if="row.is_all_refund && row.refund.length && row.refund_type != 6"
+          v-if="
+            row.refund_status == 0 &&
+            row.is_all_refund &&
+            row.refund.length &&
+            row.refund_type != 6
+          "
           class="trip"
         >
           退款中
@@ -408,7 +413,7 @@ export default {
           break;
         case "4":
           this.$refs.remarks.modals = true;
-          this.$refs.remarks.formValidate.remark = row.remark
+          this.$refs.remarks.formValidate.remark = row.remark;
           break;
         case "5":
           this.getRefundData(row.id);
@@ -662,6 +667,7 @@ export default {
     // 修改成功
     submitFail() {
       this.getList();
+      this.$emit("changeGetTabs");
     },
     // 获取退款表单数据
     getRefundData(id) {

template/admin/src/pages/setting/storage/index.vue

@@ -70,11 +70,14 @@
         <Row type="flex">
           <Col span="24">
             <span class="save-type"> 存储方式： </span>
-            <RadioGroup v-model="saveType" @on-change="changeSave">
-              <Radio :label="1">本地存储</Radio>
-              <Radio :label="2">七牛云存储</Radio>
-              <Radio :label="3">阿里云存储</Radio>
-              <Radio :label="4">腾讯云存储</Radio>
+            <RadioGroup
+              v-model="formValidate.upload_type"
+              @on-change="changeSave"
+            >
+              <Radio label="1">本地存储</Radio>
+              <Radio label="2">七牛云存储</Radio>
+              <Radio label="3">阿里云存储</Radio>
+              <Radio label="4">腾讯云存储</Radio>
             </RadioGroup>
             <!-- <i-switch
               v-model="localStorage"
@@ -659,7 +662,7 @@ export default {
       if (res.data.type == 1) {
         this.localStorage = true;
       }
-      this.saveType = res.data.type;
+      this.formValidate.upload_type = res.data.type;
       this.changeTab(res.data.type.toString());
     });
   },
@@ -673,7 +676,6 @@ export default {
   },
   methods: {
     changeSave(type) {
-      console.log(type);
       saveType(type).then((res) => {
         this.$Message.success(res.msg);
       });
@@ -798,7 +800,6 @@ export default {
       let that = this;
       positionInfoApi().then((res) => {
         this.formValidate = res.data;
-
         if (res.data.image_watermark_status == 1) {
           that.formValidate.image_watermark_status = true;
         } else {

template/uni-app-live/pages.json

@@ -1004,12 +1004,9 @@
 				{
 					"path": "goods_bargain_details/index",
 					"style": {
-						"navigationStyle": "custom"
-							// #ifdef MP
-							,
-						"navigationBarTextStyle": "white"
+						// #ifdef MP
+						"navigationBarTitleText": "砍价活动",
 							// #endif
-							,
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {

template/uni-app/api/order.js

@@ -92,6 +92,15 @@ export function orderPay(data) {
 	return request.post('order/pay', data);
 }
 
+/**
+ * 删除已退款和拒绝退款的订单
+ * @param string uni
+ * 
+ */
+export function refundOrderDel(uni) {
+	return request.get('order/refund/del/' + uni, {});
+}
+
 /**
  * 订单统计数据
  */
@@ -186,7 +195,7 @@ export function orderRefundVerify(data) {
  * 订单确认获取订单详细信息
  * @param string cartId
  */
-export function orderConfirm(cartId, news, addressId,shipping_type) {
+export function orderConfirm(cartId, news, addressId, shipping_type) {
 	return request.post('order/confirm', {
 		cartId,
 		'new': news,
@@ -346,4 +355,4 @@ export function refundOrderDetail(uni) {
  */
 export function cancelRefundOrder(uni) {
 	return request.post('order/refund/cancel/' + uni);
-}
+}

template/uni-app/components/update/app-update.vue

@@ -69,7 +69,7 @@
 		},
 		created() {
 			vm = this;
-			this.update()
+			if (!this.getVer) this.update()
 		},
 		computed: {
 			// 下载进度计算
@@ -84,7 +84,7 @@
 					width: w + "%", //return 宽度半分比
 				};
 			},
-			getHeight: function() {
+			getHeight() {
 				let bottom = 0;
 				if (this.tabbar) {
 					bottom = 50;
@@ -124,11 +124,12 @@
 						console.log(res.data)
 						const tagDate = uni.getStorageSync('app_update_time') || '',
 							nowDate = new Date().toLocaleDateString();
-						console.log(tagDate === nowDate)
-						if (tagDate !== nowDate) {
+						if (tagDate !== nowDate && !this.getVer) {
 							uni.setStorageSync('app_update_time', new Date().toLocaleDateString());
 						} else if ((tagDate !== nowDate) && this.getVer) {
 							if (!res.data.is_force) return
+						} else if (tagDate == nowDate && !this.getVer && !res.data.is_force) {
+							return
 						}
 						// 这里的返回的数据跟后台约定
 						let data = res.data;

template/uni-app/config/app.js

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

template/uni-app/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "CRMEB标准版",
+    "name" : "CRMEB",
     "appid" : "__UNI__A3F1ED4",
     "description" : "CRMEB标准版",
-    "versionName" : "1.0.0",
-    "versionCode" : 107,
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -18,11 +18,9 @@
         /* 模块配置 */
         "modules" : {
             "OAuth" : {},
-            "Geolocation" : {},
             "Payment" : {},
             "Share" : {},
-            "VideoPlayer" : {},
-            "Maps" : {}
+            "VideoPlayer" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -39,6 +37,7 @@
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CAPTURE_AUDIO_OUTPUT\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
@@ -90,12 +89,7 @@
                     }
                 },
                 "push" : {},
-                "maps" : {
-                    "amap" : {
-                        "appkey_ios" : "aeb768547b9d752891e37e1ca0a2b66d",
-                        "appkey_android" : "41ec5c3f4d110ce02a326210fe147be8"
-                    }
-                },
+                "maps" : {},
                 "oauth" : {
                     "apple" : {},
                     "weixin" : {
@@ -105,13 +99,7 @@
                     }
                 },
                 "ad" : {},
-                "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "aeb768547b9d752891e37e1ca0a2b66d",
-                        "appkey_android" : "41ec5c3f4d110ce02a326210fe147be8"
-                    }
-                },
+                "geolocation" : {},
                 "statics" : {
                     "google" : {
                         "config_ios" : "",
@@ -162,7 +150,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3b82801238ca1b57",
+        "appid" : "wx1234567890",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

template/uni-app/pages.json

@@ -998,12 +998,9 @@
 				{
 					"path": "goods_bargain_details/index",
 					"style": {
-						"navigationStyle": "custom"
-							// #ifdef MP
-							,
-						"navigationBarTextStyle": "white"
+						// #ifdef MP
+						"navigationBarTitleText": "砍价活动",
 							// #endif
-							,
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {

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

@@ -8,12 +8,12 @@
 				</view>
 				<view class="bnt" @click="codeChange">立即核销</view>
 			</view>
-			<!-- #ifdef MP || MP-WEIXIN -->
+			<!-- #ifdef MP || MP-WEIXIN || APP-PLUS -->
 			<view class="scan" @click="scanCode">
 				<image src="../static/scan.gif"></image>
 			</view>
 			<!-- #endif -->
-			<!-- #ifdef H5 -->
+			<!-- #ifdef H5  -->
 			<view v-if="isWeixin" class="scan" @click="scanCode">
 				<image src="../static/scan.gif"></image>
 			</view>
@@ -51,7 +51,7 @@
 		components: {
 			home
 		},
-		mixins:[colors],
+		mixins: [colors],
 		data() {
 			return {
 				iShidden: false,
@@ -69,12 +69,12 @@
 			/**
 			 * 去订单详情
 			 */
-			goOrderDetails: function(id,type) {
-				if(type == 'integral'){
+			goOrderDetails: function(id, type) {
+				if (type == 'integral') {
 					uni.navigateTo({
 						url: '/pages/points_mall/integral_order_details?order_id=' + id
 					});
-				}else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/users/admin_order_detail/index?id=' + id + '&goname=look'
 					});
@@ -110,7 +110,7 @@
 			// 扫码核
 			scanCode() {
 				var self = this;
-				// #ifdef MP
+				// #ifdef MP || APP-PLUS
 				wx.scanCode({
 					scanType: ["qrCode", "barCode"],
 					success(res) {

template/uni-app/pages/goods_cate/goods_cate1.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="scroll-box">
 			<view class='aside'>
-				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: 100%;">
+				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
 					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
 						v-for="(item,index) in productList" :key="index" @click='tap(index,"b"+index)'>
 						<text>{{item.cate_name}}</text>

template/uni-app/pages/goods_cate/goods_cate2.vue

@@ -3,7 +3,8 @@
 		<!-- <view>
 			<scroll-view scroll-y="true" class="scroll-Y"> -->
 		<view class="header acea-row row-center-wrapper">
-			<navigator open-type="switchTab" url='/pages/index/index' class="pageIndex" hover-class="none" @click="jumpIndex">
+			<navigator open-type="switchTab" url='/pages/index/index' class="pageIndex" hover-class="none"
+				@click="jumpIndex">
 				<text class="iconfont icon-shouye3"></text>
 			</navigator>
 			<navigator url="/pages/goods_search/index" class="search acea-row row-center-wrapper" hover-class="none">
@@ -13,7 +14,7 @@
 		</view>
 		<view class="conter">
 			<view class='aside'>
-				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: 100%;">
+				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
 					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
 						v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
 						<text>{{item.cate_name}}</text>

template/uni-app/pages/goods_cate/goods_cate3.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="conter">
 			<view class='aside'>
-				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: 100%;">
+				<scroll-view scroll-y="true" scroll-with-animation='true' style="height: calc(100% - 100rpx)">
 					<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""'
 						v-for="(item,index) in categoryList" :key="index" @click="tapNav(index,item)">
 						<text>{{item.cate_name}}</text>

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

@@ -740,7 +740,11 @@
 							return getCustomer(url)
 
 						} else if (name === '订单核销') {
-							return window.location.href = `${location.origin}${url}`
+							console.log(`${url}`)
+							return uni.navigateTo({
+								url:url
+							});
+							// return window.location.href = `${location.origin}${url}`
 						}
 						// #endif
 

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

@@ -1161,12 +1161,12 @@
 			 * 
 			 * 删除订单
 			 */
-			delOrder: function() {
+			delOrder() {
 				let that = this;
 				uni.showModal({
 					title: '删除订单',
 					content: '确定删除该订单',
-					success: function(res) {
+					success: (res) => {
 						if (res.confirm) {
 							(that.isReturen ? refundOrderDel : orderDel)(that.order_id).then(res => {
 								if (that.status.type == -2) {

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

@@ -5,21 +5,15 @@
 				<view class='name acea-row row-center-wrapper'>
 					<!-- 当前佣金 -->
 					<view>
-						<view class="user-msg" @click="jumbPath">
+						<view class="user-msg">
 							<image class="avatar" :src="userInfo.avatar" mode=""></image>
 							<view class="nickname">{{userInfo.nickname}}</view>
-							<view class="level">
-								{{userInfo.agent_level_name?userInfo.agent_level_name:'分销等级'}}
-								<text class='iconfont icon-xiangyou'></text>
+							<view v-if="userInfo.is_agent_level" class="level" @click="jumbPath">
+								<text>{{userInfo.agent_level_name?userInfo.agent_level_name:'分销等级'}}</text>
+								<text v-if="userInfo.is_agent_level" class='iconfont icon-xiangyou'></text>
 							</view>
 						</view>
 					</view>
-					<view class="distribution acea-row row-center-wrapper" :class="userInfo.agent_level_name?'on':''"
-						@click="jumbPath" v-if="userInfo.is_agent_level">
-						<text class="iconfont icon-dengjitubiao"></text>
-						<text>{{userInfo.agent_level_name?userInfo.agent_level_name:'分销等级'}}</text>
-						<text class="iconfont icon-you"></text>
-					</view>
 				</view>
 				<view class='num'>{{userInfo.brokerage_price}}</view>
 				<view class='profit acea-row row-between-wrapper'>
@@ -226,7 +220,8 @@
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		width: 100%;
-		height: 480rpx;
+		// height: 480rpx;
+		padding-bottom: 20rpx;
 		background-color: var(--view-theme);
 	}