add

src/views/crm/third/index.vue

@@ -43,7 +43,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['third:third:add']"
+          v-hasPermi="['crm:third:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['third:third:edit']"
+          v-hasPermi="['crm:third:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,18 +63,18 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['third:third:remove']"
+          v-hasPermi="['crm:thrid:delete']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['third:third:export']"
+          v-hasPermi="['crm:third:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -93,16 +93,17 @@
       <el-table-column label="授权账号" width="120px" align="center" prop="account" />
       <el-table-column label="广告主ids" width="200" align="center" prop="advertiserIds">
         <template slot-scope="scope">
-             {{ scope.row.advertiserIds.length>200?scope.row.advertiserIds.substr(0,200)+"...":scope.row.advertiserIds  }}   
+             {{  getSubStr(scope.row.advertiserIds)   }}   
         </template>
       </el-table-column>
       <el-table-column label="广告主名称" width="300" align="center" prop="advertiserNames">
         <template slot-scope="scope">
-             {{ scope.row.advertiserNames.length>200?scope.row.advertiserNames.substr(0,200)+"...":scope.row.advertiserNames  }}   
+             {{  getSubStr(scope.row.advertiserNames)   }}   
         </template>
       </el-table-column>
       <!-- <el-table-column label="appid"  align="center" prop="appId" />
       <el-table-column label="secret" align="center" prop="appSecret" /> -->
+
       <el-table-column label="accessToken" align="center" prop="accessToken" />
       <el-table-column label="refreshToken" align="center" prop="refreshToken" />
       <el-table-column  label="授权状态" width="90px" align="center" prop="status">
@@ -140,7 +141,6 @@
             type="text"
             icon="el-icon-paperclip"
             @click="handleAuth(scope.row)"
-            v-hasPermi="['crm:third:auth']"
           >授权</el-button>
           <!-- <el-button
             size="mini"
@@ -358,6 +358,7 @@ export default {
       this.loading = true;
       listThird(this.queryParams).then(response => {
           this.thirdList = response.rows;
+          console.log("qxj thirdList",JSON.stringify(this.thirdList));
           this.total = response.total;
           this.loading = false;
       });
@@ -497,11 +498,14 @@ export default {
     handleAuth(row){
         var scopeUrl="";
         if(row.thirdType==1){
-            scopeUrl="https://open.oceanengine.com/audit/oauth.html?app_id="+row.appId+"&state="+row.id+"&redirect_uri=http%3A%2F%2Flocalhost%3A1024%2Fcustomer%2FfeiyuOauthCallback/";
+            if (process.env.NODE_ENV === "development"){
+                scopeUrl="https://open.oceanengine.com/audit/oauth.html?app_id="+row.appId+"&state="+row.id+"&redirect_uri=http%3A%2F%2Flocalhost%3A1024%2Fcustomer%2FfeiyuOauthCallback/";
+            }else{
+                scopeUrl="https://open.oceanengine.com/audit/oauth.html?app_id="+row.appId+"&state="+row.id+"&redirect_uri=http%3A%2F%2Fadmin.yjf.runtzh.com%2Fcustomer%2FfeiyuOauthCallback%2F";
+            }
         }
-        //scopeUrl="https://ad.oceanengine.com/openapi/audit/oauth.html?app_id="+row.appId+"&state=xxx&scope=[10,69,14]&redirect_uri=http://oms.nat100.top/third/feiyu/oauthCallback/";
         //scopeUrl=encodeURI(scopeUrl)
-        //let path = window.location.protocol +  "//" + scopeUrl
+        console.log("qxj process.env.NODE_ENV:",process.env.NODE_ENV);
         window.location.href = scopeUrl;
     },
     saveFeiyuAuth(){
@@ -533,6 +537,13 @@ export default {
        this.feiyuCrmLineList.open=false;
        this.getList();
     },
+    getSubStr(sorstr){
+      var formatStr="";
+       if(!!sorstr){
+          formatStr=sorstr.length>200?sorstr.substr(0,200)+"...":sorstr;
+       }
+       return formatStr;
+    }
   }
 };
 </script>

src/views/store/storeOrder/index.vue

@@ -47,18 +47,15 @@
       </el-form-item>
       <el-form-item label="收件人" prop="realName">
         <el-input
-
           v-model="queryParams.realName"
           placeholder="请输入收件人姓名"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          @keyup.enter.native="handleQuery"/>
       </el-form-item>
-
+     
       <el-form-item label="员工姓名" prop="companyUserNickName">
         <el-input
-
           v-model="queryParams.companyUserNickName"
           placeholder="请输入员工姓名"
           clearable
@@ -66,16 +63,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产品" prop="productName">
-        <el-input
-
-          v-model="queryParams.productName"
-          placeholder="请输入产品名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="订单类型" prop="orderType">
          <el-select   v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small" >
          <el-option
@@ -105,16 +92,6 @@
                 :value="item.dictValue"
               />
         </el-select>
-      </el-form-item>
-        <el-form-item label="支付方式" prop="payType">
-         <el-select style="width: 200px" v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small" >
-         <el-option
-                v-for="item in payTypeOptions"
-                :key="item.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-        </el-select>
       </el-form-item>
       <el-form-item label="下单时间" prop="createTimeRange">
         <el-date-picker
@@ -196,7 +173,7 @@
           v-hasPermi="['store:storeOrder:exportItems']"
         >导出订单明细</el-button>
       </el-col>
-
+      
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
@@ -233,7 +210,7 @@
                   <div class="sku">{{ JSON.parse(item.jsonInfo).sku}}</div>
                   <div class="price">￥{{JSON.parse(item.jsonInfo).price}}×{{item.num}}</div>
                 </div>
-
+                
               </div>
           </template>
       </el-table-column> -->
@@ -276,7 +253,7 @@
               <el-tag prop="status" v-for="(item, index) in deliveryPayStatusOptions"    v-if="scope.row.deliveryPayStatus==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-
+    
       <el-table-column label="操作" fixed="right" width="80px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -294,7 +271,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -462,7 +439,7 @@
        <div class="import-msg" v-html="importMsg">
        </div>
     </el-dialog>
-
+    
   </div>
 </template>
 
@@ -604,7 +581,7 @@ export default {
         isRemind: null,
         isSysDel: null,
         deptId:null,
-
+     
       },
       // 表单参数
       form: {
@@ -619,7 +596,7 @@ export default {
         addressId: [
           { required: true, message: "收货信息不能为空" }
         ],
-
+        
       },
       upload: {
         // 是否显示弹出层（用户导入）
@@ -663,7 +640,7 @@ export default {
     this.getDicts("store_delivery_pay_status").then((response) => {
       this.deliveryPayStatusOptions = response.data;
     });
-
+    
     this.getList();
   },
   methods: {
@@ -802,7 +779,7 @@ export default {
       else{
         this.queryParams.deliverySendTimeRange=null;
       }
-
+      
       listStoreOrder(this.queryParams).then(response => {
         this.storeOrderList = response.rows;
         this.total = response.total;
@@ -819,7 +796,7 @@ export default {
       this.form = {
         addressId:null,
         userId:null,
-
+        
       };
       this.resetForm("form");
     },
@@ -868,7 +845,7 @@ export default {
               this.getList();
             }
           });
-
+       
         }
       });
     },
@@ -876,7 +853,7 @@ export default {
     handleDelete(row) {
        this.products.splice(this.products.findIndex(item => item.id === row.id), 1)
        this.compute();
-
+       
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -973,7 +950,7 @@ export default {
       //   });
       this.getList();
     },
-
+     
         /** 查询部门下拉树结构 */
     getTreeselect() {
         var that=this;
@@ -1015,7 +992,7 @@ export default {
     max-width: 200px;
     text-align: left;
     .goods-title{
-
+      
       overflow:hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -1038,4 +1015,4 @@ export default {
   }
 
 </style>
-
+