解决冲突

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "kjds",
-    "appid" : "__UNI__EF90963",
+    "appid" : "__UNI__F715804",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pageC/myPackage/myPackage.vue

@@ -79,8 +79,8 @@ export default {
     },
   },
   onLoad(options) {
-  	this.follow = options.type
-	this.getPackageList(1);
+    this.follow = options.type || "to_transit";
+    this.getPackageList(1);
   },
   methods: {
     tabSwitch(num) {

pageD/commodityManage/commodityManage.vue

@@ -63,7 +63,7 @@
                 shape="circle"
                 color="#f83224"
                 activeColor="#f83224"
-                :disabled="item.goods.status == 'down'"
+                :disabled="item.status == 'down'"
               >
               </u-checkbox>
             </view>
@@ -172,7 +172,7 @@ export default {
     goodsLength() {
       let num = 0;
       this.goodsList.map((item) => {
-        if (item.goods.status != "down") {
+        if (item.status != "down") {
           num++;
         }
       });
@@ -218,7 +218,7 @@ export default {
               merchant_goods_id: this.needDeleteGoods.id,
             })
             .then((res) => {
-              this.getCommodityList();
+              this.getCommodityList(this.follow);
               uni.showToast({
                 title: "商品已删除",
                 icon: "none",
@@ -239,7 +239,7 @@ export default {
           uni.showToast({
             title: value == "down" ? "商品已下架" : "商品已上架",
           });
-          this.getCommodityList();
+          this.getCommodityList(this.follow);
         });
     },
 
@@ -300,7 +300,7 @@ export default {
         this.goodsList.map((item) => {
           if (
             this.selectedGoods.indexOf(item.id) == -1 &&
-            item.goods.status != "down"
+            item.status != "down"
           ) {
             this.selectedGoods.push(item.id);
           }

pageD/commodityManage/component/goodsInformation.vue

@@ -2,7 +2,7 @@
   <view class="detail" @click="$emit('toDetail', itemInfo)" :style="isPadding">
     <view class="content">
       <image :src="itemInfo.goods.image" mode="" class="content-img"></image>
-      <view class="mask" v-if="itemInfo.goods.status == 'down'">
+      <view class="mask" v-if="itemInfo.status == 'down'">
         <view class="text-1"> 已下架 </view>
       </view>
       <view class="content-right">
@@ -51,28 +51,28 @@
     <view class="btn-list" v-if="!batch && productAndCommodity == 'commodity'">
       <button
         class="btn-1"
-        v-if="itemInfo.goods.status == 'normal'"
+        v-if="itemInfo.status == 'normal'"
         @click.stop="$emit('openDiscountsPopup', itemInfo)"
       >
         我要打折
       </button>
       <button
         class="btn-1"
-        v-if="itemInfo.goods.status == 'normal'"
+        v-if="itemInfo.status == 'normal'"
         @click.stop="$emit('addAndRemove', itemInfo, 'down')"
       >
         下架
       </button>
       <button
         class="btn-1"
-        v-if="itemInfo.goods.status == 'down'"
+        v-if="itemInfo.status == 'down'"
         @click.stop="$emit('deleteGoods', itemInfo)"
       >
         删除
       </button>
       <button
         class="btn-1"
-        v-if="itemInfo.goods.status == 'down'"
+        v-if="itemInfo.status == 'down'"
         @click.stop="$emit('addAndRemove', itemInfo, 'normal')"
       >
         上架

pageD/orderDetail/orderDetail.vue

@@ -26,8 +26,8 @@
       <view
         class="logistics"
         v-if="
-          orderDetail.delivery_status == 'merdelivered' ||
-          orderDetail.delivery_status == 'delivered'
+          orderDetail.simplify_status == 'merdelivered' ||
+          orderDetail.simplify_status == 'delivered'
         "
       >
         <text class="_label">物流单号</text>
@@ -45,7 +45,7 @@
     </view>
 
     <commodityDetailVue
-      :status="orderDetail.delivery_status"
+      :status="orderDetail.simplify_status"
       :commodityInformation="orderDetail"
     />
 
@@ -86,26 +86,26 @@
         <view> 210 </view>
       </view> -->
     </view>
-    <view class="footer" v-if="orderDetail.delivery_status != 'merdelivered'">
-      <button class="status-2" v-if="orderDetail.delivery_status == 'unfill'">
+    <view class="footer" v-if="orderDetail.simplify_status != 'merdelivered'">
+      <button class="status-2" v-if="orderDetail.simplify_status == 'unfill'">
         缴纳保证金
       </button>
       <button
         class="status-1"
-        v-if="orderDetail.delivery_status == 'undelivered'"
+        v-if="orderDetail.simplify_status == 'undelivered'"
       >
         备注
       </button>
       <button
         class="status-2"
-        v-if="orderDetail.delivery_status == 'undelivered'"
+        v-if="orderDetail.simplify_status == 'undelivered'"
         @click="toSendOutGoods"
       >
         立即发货
       </button>
       <button
         class="status-1"
-        v-if="orderDetail.delivery_status == 'delivered'"
+        v-if="orderDetail.simplify_status == 'delivered'"
       >
         查看物流
       </button>
@@ -155,13 +155,13 @@ export default {
           this.transportType = res.container.transport_type_name;
         }
         //根据订单状态，显示不同的字段
-        if (res.delivery_status == "unfill") {
+        if (res.simplify_status == "unfill") {
           this.title = "待缴纳保证金";
-        } else if (res.delivery_status == "undelivered") {
+        } else if (res.simplify_status == "undelivered") {
           this.title = "待团长发货";
-        } else if (res.delivery_status == "merdelivered") {
+        } else if (res.simplify_status == "merdelivered") {
           this.title = "待总部发货";
-        } else if (res.delivery_status == "delivered") {
+        } else if (res.simplify_status == "delivered") {
           this.title = "总部已发货";
         }
       });

pageD/orderFormManage/component/detailCard.vue

@@ -49,33 +49,33 @@
           }}</text>
         </view>
       </view>
-      <view class="model" v-if="itemInfo.delivery_status == 'unreview'"> </view>
+      <view class="model" v-if="itemInfo.simplify_status == 'unreview'"> </view>
     </view>
-    <view class="remarks" v-if="itemInfo.delivery_status == 'undelivered'">
+    <view class="remarks" v-if="itemInfo.simplify_status == 'merdelivered'">
       <view style="margin-right: 30rpx; color: #222"> 商家备注 </view>
       <view style="color: rgba(34, 34, 34, 0.6)"> {{ itemInfo.remark }} </view>
     </view>
     <view
       class="btn-list"
       v-if="
-        itemInfo.delivery_status !== 'unreview' &&
-        itemInfo.status != 'merdelivered'
+        itemInfo.simplify_status !== 'unreview' &&
+        itemInfo.status != 'undelivered'
       "
     >
-      <button class="btn-1" v-if="itemInfo.delivery_status == 'unfill'">
+      <button class="btn-1" v-if="itemInfo.simplify_status == 'unfill'">
         缴纳保证金
       </button>
-      <button class="btn-2" v-if="itemInfo.delivery_status == 'undelivered'">
+      <button class="btn-2" v-if="itemInfo.simplify_status == 'merdelivered'">
         备注
       </button>
       <button
         class="btn-1"
-        v-if="itemInfo.delivery_status == 'undelivered'"
+        v-if="itemInfo.simplify_status == 'merdelivered'"
         @click.stop="toGoods"
       >
         发货
       </button>
-      <button class="btn-2" v-if="itemInfo.delivery_status == ' delivered'">
+      <button class="btn-2" v-if="itemInfo.simplify_status == ' delivered'">
         查看物流
       </button>
     </view>
@@ -92,23 +92,25 @@ export default {
   },
   computed: {
     model() {
-      if (this.itemInfo.delivery_status == "unreview") {
+      if (this.itemInfo.simplify_status == "unreview") {
         return "filter: blur(5px);";
+      } else {
+        return "";
       }
     },
     //根据状态 返回不同的字段
     deliveryStatus() {
-      if (this.itemInfo.delivery_status == "unreview") {
+      if (this.itemInfo.simplify_status == "unreview") {
         return "待审核";
-      } else if (this.itemInfo.delivery_status == "unfill") {
+      } else if (this.itemInfo.simplify_status == "unfill") {
         return "待缴纳保证金";
-      } else if (this.itemInfo.delivery_status == "undelivered") {
+      } else if (this.itemInfo.simplify_status == "merdelivered") {
         return "待团长发货";
-      } else if (this.itemInfo.delivery_status == "merdelivered") {
+      } else if (this.itemInfo.simplify_status == "undelivered") {
         return "待总部发货";
-      } else if (this.itemInfo.delivery_status == "delivered") {
+      } else if (this.itemInfo.simplify_status == "delivered") {
         return "已发货";
-      } else if (this.itemInfo.delivery_status == "domestic_delivered") {
+      } else if (this.itemInfo.simplify_status == "domestic_delivered") {
         return "团长已发货";
       }
     },

pages/login/login.vue

@@ -1,17 +1,28 @@
 <template>
-	<!-- 登录 -->
-	<view style="
+  <!-- 登录 -->
+  <view
+    style="
       padding: 0 44rpx;
       background-color: #fff;
       height: 100vh;
       overflow: hidden;
-    ">
-		<view class="" style="text-align: center; margin-top: 156rpx">
-			<image src="../../static/images/logo.png" style="width: 350rpx; height: 350rpx" mode=""></image>
-		</view>
-		<button open-type="getPhoneNumber" class="login-btn" @getphonenumber="tologin">
-			微信授权登录
-		</button>
+    "
+  >
+    <view class="" style="text-align: center; margin-top: 156rpx">
+      <image
+        src="../../static/images/logo.png"
+        style="width: 350rpx; height: 350rpx"
+        mode=""
+      ></image>
+    </view>
+    <button
+      open-type="getPhoneNumber"
+      class="login-btn"
+      @getphonenumber="tologin"
+    >
+      微信授权登录
+    </button>
+
 
 		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
@@ -180,36 +191,37 @@
 			}
 		},
 	};
+
 </script>
 
 <style lang="scss" scoped>
-	page {
-		background-color: #ffffff !important;
-		height: 100vh;
-	}
+page {
+  background-color: #ffffff !important;
+  height: 100vh;
+}
 
-	.login-btn {
-		width: 662rpx;
-		height: 96rpx;
-		background: #f83224;
-		box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
-		border-radius: 48rpx;
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #ffffff;
-		line-height: 96rpx;
-		text-align: center;
-		font-style: normal;
-	}
+.login-btn {
+  width: 662rpx;
+  height: 96rpx;
+  background: #f83224;
+  box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+  border-radius: 48rpx;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #ffffff;
+  line-height: 96rpx;
+  text-align: center;
+  font-style: normal;
+}
 
-	.fontYin {
-		font-family: PingFangSC, PingFang SC;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #666666;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-	}
-</style>
+.fontYin {
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #666666;
+  line-height: 34rpx;
+  text-align: left;
+  font-style: normal;
+}
+</style>

unpackage/cache/appleConfig.ini

@@ -0,0 +1,17 @@
+[appleAppid]
+appleAppid=com.yixiang.vr
+
+[iosStyle]
+iosStyle=
+
+[universalLinks]
+universalLinks=
+spaceid=
+
+[universalLinks_qq]
+universalLinks_qq=
+spaceid_qq=
+
+[universalLinks_weibo]
+universalLinks_weibo=
+spaceid_weibo=

unpackage/cache/certdataios

@@ -0,0 +1,3 @@
+iosProfile=C:/Users/Administrator/Desktop/vr (1).mobileprovision
+ioscertFile=C:/Users/Administrator/Desktop/忆象开发证书.p12
+ioscertPassword=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/dist/build/app-plus/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/dist/build/app-plus/app-config.js

@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);